diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 03e1bba..2b4407d 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-# Contributing to almigthy-core
+# Contributing to fabric8-wit
 
 You are welcome to contribute to this project.  Here are few
 suggestions to help you to contribute.  You can contribute to this
diff --git a/.gitignore b/.gitignore
index 36e393d..4ea3874 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,11 +60,11 @@ _testmain.go
 *.test
 *.prof
 
-# ALMighty specific artifacts
+# Fabric8-wit specific artifacts
 /debug
 **/debug.test
 
-# ALMighty binaries
+# Fabric8-wit binaries
 bin/
 
 # Glide package manager
diff --git a/.make/Makefile.lnx b/.make/Makefile.lnx
index dd958db..fd83a58 100644
--- a/.make/Makefile.lnx
+++ b/.make/Makefile.lnx
@@ -1,5 +1,5 @@
-BINARY_SERVER_BIN=$(INSTALL_PREFIX)/alm
-BINARY_CLIENT_BIN=$(INSTALL_PREFIX)/alm-cli
+BINARY_SERVER_BIN=$(INSTALL_PREFIX)/wit
+BINARY_CLIENT_BIN=$(INSTALL_PREFIX)/wit-cli
 GLIDE_BIN=glide
 GOAGEN_BIN=$(VENDOR_DIR)/github.com/goadesign/goa/goagen/goagen
 GO_BINDATA_BIN=$(VENDOR_DIR)/github.com/jteeuwen/go-bindata/go-bindata/go-bindata
diff --git a/.make/Makefile.win b/.make/Makefile.win
index ed05503..15a689e 100644
--- a/.make/Makefile.win
+++ b/.make/Makefile.win
@@ -1,5 +1,5 @@
-BINARY_SERVER_BIN=$(INSTALL_PREFIX)/alm.exe
-BINARY_CLIENT_BIN=$(INSTALL_PREFIX)/alm-cli.exe
+BINARY_SERVER_BIN=$(INSTALL_PREFIX)/wit.exe
+BINARY_CLIENT_BIN=$(INSTALL_PREFIX)/wit-cli.exe
 GLIDE_BIN=glide.exe
 GOAGEN_BIN=$(VENDOR_DIR)/github.com/goadesign/goa/goagen/goagen.exe
 GO_BINDATA_BIN=$(VENDOR_DIR)/github.com/jteeuwen/go-bindata/go-bindata/go-bindata.exe
diff --git a/.make/docker.mk b/.make/docker.mk
index f7c17a3..754b10f 100644
--- a/.make/docker.mk
+++ b/.make/docker.mk
@@ -107,8 +107,8 @@ endif
 ifeq ($(strip $(shell docker inspect --format '{{ .NetworkSettings.IPAddress }}' make_postgres_integration_test_1 2>/dev/null)),)
 	$(error Failed to find PostgreSQL container. Try running "make integration-test-env-prepare")
 endif
-	$(eval ALMIGHTY_POSTGRES_HOST := $(shell docker inspect --format '{{ .NetworkSettings.IPAddress }}' make_postgres_integration_test_1 2>/dev/null))
-	docker exec -t $(DOCKER_RUN_INTERACTIVE_SWITCH) "$(DOCKER_CONTAINER_NAME)" bash -ec 'export ALMIGHTY_POSTGRES_HOST=$(ALMIGHTY_POSTGRES_HOST); make $(makecommand)'
+	$(eval F8_POSTGRES_HOST := $(shell docker inspect --format '{{ .NetworkSettings.IPAddress }}' make_postgres_integration_test_1 2>/dev/null))
+	docker exec -t $(DOCKER_RUN_INTERACTIVE_SWITCH) "$(DOCKER_CONTAINER_NAME)" bash -ec 'export F8_POSTGRES_HOST=$(F8_POSTGRES_HOST); make $(makecommand)'
 
 # This is a wildcard target to let you call any make target from the normal makefile
 # but it will run inside the docker container. This target will only get executed if
diff --git a/.make/test.mk b/.make/test.mk
index f3843c3..99eaf24 100644
--- a/.make/test.mk
+++ b/.make/test.mk
@@ -94,9 +94,9 @@ GO_TEST_VERBOSITY_FLAG ?= -v
 
 # By default use the "localhost" or specify manually during make invocation:
 #
-# 	ALMIGHTY_POSTGRES_HOST=somehost make test-integration
+# 	F8_POSTGRES_HOST=somehost make test-integration
 #
-ALMIGHTY_POSTGRES_HOST ?= localhost
+F8_POSTGRES_HOST ?= localhost
 
 # Output directory for coverage information
 COV_DIR = $(TMP_PATH)/coverage
@@ -144,7 +144,7 @@ test-unit: prebuild-check clean-coverage-unit $(COV_PATH_UNIT)
 test-unit-no-coverage: prebuild-check $(SOURCES)
 	$(call log-info,"Running test: $@")
 	$(eval TEST_PACKAGES:=$(shell go list ./... | grep -v $(ALL_PKGS_EXCLUDE_PATTERN)))
-	ALMIGHTY_DEVELOPER_MODE_ENABLED=1 ALMIGHTY_RESOURCE_UNIT_TEST=1 go test $(GO_TEST_VERBOSITY_FLAG) $(TEST_PACKAGES)
+	F8_DEVELOPER_MODE_ENABLED=1 F8_RESOURCE_UNIT_TEST=1 go test $(GO_TEST_VERBOSITY_FLAG) $(TEST_PACKAGES)
 
 .PHONY: test-integration
 ## Runs the integration tests and produces coverage files for each package.
@@ -157,7 +157,7 @@ test-integration: prebuild-check clean-coverage-integration migrate-database $(C
 test-integration-no-coverage: prebuild-check migrate-database $(SOURCES)
 	$(call log-info,"Running test: $@")
 	$(eval TEST_PACKAGES:=$(shell go list ./... | grep -v $(ALL_PKGS_EXCLUDE_PATTERN)))
-	ALMIGHTY_DEVELOPER_MODE_ENABLED=1 ALMIGHTY_RESOURCE_DATABASE=1 ALMIGHTY_RESOURCE_UNIT_TEST=0 go test $(GO_TEST_VERBOSITY_FLAG) $(TEST_PACKAGES)
+	F8_DEVELOPER_MODE_ENABLED=1 F8_RESOURCE_DATABASE=1 F8_RESOURCE_UNIT_TEST=0 go test $(GO_TEST_VERBOSITY_FLAG) $(TEST_PACKAGES)
 
 .PHONY: test-remote
 ## Runs the remote tests and produces coverage files for each package.
@@ -168,13 +168,13 @@ test-remote: prebuild-check clean-coverage-remote $(COV_PATH_REMOTE)
 test-remote-no-coverage: prebuild-check $(SOURCES)
 	$(call log-info,"Running test: $@")
 	$(eval TEST_PACKAGES:=$(shell go list ./... | grep -v $(ALL_PKGS_EXCLUDE_PATTERN)))
-	ALMIGHTY_DEVELOPER_MODE_ENABLED=1 ALMIGHTY_RESOURCE_REMOTE=1 ALMIGHTY_RESOURCE_UNIT_TEST=0 go test $(GO_TEST_VERBOSITY_FLAG) $(TEST_PACKAGES)
+	F8_DEVELOPER_MODE_ENABLED=1 F8_RESOURCE_REMOTE=1 F8_RESOURCE_UNIT_TEST=0 go test $(GO_TEST_VERBOSITY_FLAG) $(TEST_PACKAGES)
 
 .PHONY: test-migration
 ## Runs the migration tests and should be executed before running the integration tests
 ## in order to have a clean database
 test-migration: prebuild-check
-	ALMIGHTY_RESOURCE_DATABASE=1 go test $(GO_TEST_VERBOSITY_FLAG) github.com/fabric8-services/fabric8-wit/migration
+	F8_RESOURCE_DATABASE=1 go test $(GO_TEST_VERBOSITY_FLAG) github.com/fabric8-services/fabric8-wit/migration
 
 # Downloads docker-compose to tmp/docker-compose if it does not already exist.
 define download-docker-compose
@@ -411,7 +411,7 @@ $(eval ENV_VAR := $(5))
 $(eval ALL_PKGS_COMMA_SEPARATED := $(6))
 @mkdir -p $(COV_DIR)/$(PACKAGE_NAME);
 $(eval COV_OUT_FILE := $(COV_DIR)/$(PACKAGE_NAME)/coverage.$(TEST_NAME).mode-$(COVERAGE_MODE))
-@$(ENV_VAR) ALMIGHTY_DEVELOPER_MODE_ENABLED=1 ALMIGHTY_POSTGRES_HOST=$(ALMIGHTY_POSTGRES_HOST) \
+@$(ENV_VAR) F8_DEVELOPER_MODE_ENABLED=1 F8_POSTGRES_HOST=$(F8_POSTGRES_HOST) \
 	go test $(PACKAGE_NAME) \
 		$(GO_TEST_VERBOSITY_FLAG) \
 		-coverprofile $(COV_OUT_FILE) \
@@ -471,7 +471,7 @@ $(COV_PATH_INTEGRATION): $(SOURCES) $(GOCOVMERGE_BIN)
 	@-rm -f $(ERRORS_FILE)
 	$(eval TEST_PACKAGES:=$(shell go list ./... | grep -v $(ALL_PKGS_EXCLUDE_PATTERN)))
 	$(eval ALL_PKGS_COMMA_SEPARATED:=$(shell echo $(TEST_PACKAGES)  | tr ' ' ,))
-	$(foreach package, $(TEST_PACKAGES), $(call test-package,$(TEST_NAME),$(package),$(COV_PATH_INTEGRATION),$(ERRORS_FILE),ALMIGHTY_RESOURCE_DATABASE=1 ALMIGHTY_RESOURCE_UNIT_TEST=0,$(ALL_PKGS_COMMA_SEPARATED)))
+	$(foreach package, $(TEST_PACKAGES), $(call test-package,$(TEST_NAME),$(package),$(COV_PATH_INTEGRATION),$(ERRORS_FILE),F8_RESOURCE_DATABASE=1 F8_RESOURCE_UNIT_TEST=0,$(ALL_PKGS_COMMA_SEPARATED)))
 	$(call check-test-results,$(ERRORS_FILE))
 
 # NOTE: We don't have prebuild-check as a dependency here because it would cause
diff --git a/Dockerfile.deploy b/Dockerfile.deploy
index 02fffc2..2a0af16 100644
--- a/Dockerfile.deploy
+++ b/Dockerfile.deploy
@@ -2,30 +2,30 @@ FROM centos:7
 LABEL maintainer "Devtools <devtools@redhat.com>"
 LABEL author "Konrad Kleine <kkleine@redhat.com>"
 ENV LANG=en_US.utf8
-ENV ALMIGHTY_INSTALL_PREFIX=/usr/local/alm
+ENV F8_INSTALL_PREFIX=/usr/local/wit
 
-# Create a non-root user and a group with the same name: "almighty"
-ENV ALMIGHTY_USER_NAME=almighty
-RUN useradd --no-create-home -s /bin/bash ${ALMIGHTY_USER_NAME}
+# Create a non-root user and a group with the same name: "wit"
+ENV F8_USER_NAME=wit
+RUN useradd --no-create-home -s /bin/bash ${F8_USER_NAME}
 
-COPY bin/alm ${ALMIGHTY_INSTALL_PREFIX}/bin/alm
-COPY config.yaml ${ALMIGHTY_INSTALL_PREFIX}/etc/config.yaml
+COPY bin/wit ${F8_INSTALL_PREFIX}/bin/wit
+COPY config.yaml ${F8_INSTALL_PREFIX}/etc/config.yaml
 
 # Install little pcp pmcd server for metrics collection
 # would prefer only pmcd, and not the /bin/pm*tools etc.
 COPY pcp.repo /etc/yum.repos.d/pcp.repo
 RUN yum install -y pcp && yum clean all && \
     mkdir -p /etc/pcp /var/run/pcp /var/lib/pcp /var/log/pcp && \
-    chown -R ${ALMIGHTY_USER_NAME} /etc/pcp /var/run/pcp /var/lib/pcp /var/log/pcp && \
+    chown -R ${F8_USER_NAME} /etc/pcp /var/run/pcp /var/lib/pcp /var/log/pcp && \
     chmod -R ug+rw /etc/pcp /var/run/pcp /var/lib/pcp /var/log/pcp
-COPY ./alm+pmcd.sh /alm+pmcd.sh
+COPY ./wit+pmcd.sh /wit+pmcd.sh
 EXPOSE 44321
 
 
 # From here onwards, any RUN, CMD, or ENTRYPOINT will be run under the following user
-USER ${ALMIGHTY_USER_NAME}
+USER ${F8_USER_NAME}
 
-WORKDIR ${ALMIGHTY_INSTALL_PREFIX}
-ENTRYPOINT [ "/alm+pmcd.sh" ]
+WORKDIR ${F8_INSTALL_PREFIX}
+ENTRYPOINT [ "/wit+pmcd.sh" ]
 
 EXPOSE 8080
diff --git a/Makefile b/Makefile
index 493648c..6739d9c 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ export GIT_COMMITTER_NAME
 export GIT_COMMITTER_EMAIL
 
 # Used as target and binary output names... defined in includes
-CLIENT_DIR=tool/alm-cli
+CLIENT_DIR=tool/wit-cli
 
 COMMIT=$(shell git rev-parse HEAD)
 GITUNTRACKEDCHANGES := $(shell git status --porcelain --untracked-files=no)
@@ -242,12 +242,12 @@ generate: app/controllers.go assets/js/client.js bindata_assetfs.go migration/sq
 
 .PHONY: regenerate
 ## Runs the "clean-generated" and the "generate" target
-regenerate: clean-generated generate 
+regenerate: clean-generated generate
 
 .PHONY: dev
 dev: prebuild-check deps generate $(FRESH_BIN)
 	docker-compose up -d db
-	ALMIGHTY_DEVELOPER_MODE_ENABLED=true $(FRESH_BIN)
+	F8_DEVELOPER_MODE_ENABLED=true $(FRESH_BIN)
 
 include ./.make/test.mk
 
diff --git a/README.adoc b/README.adoc
index 99b35f7..ca8ff9f 100644
--- a/README.adoc
+++ b/README.adoc
@@ -324,15 +324,15 @@ github.secret : 2fe6736e90a9283036a37059d75ac0c82f4f5288
 Although this is a YAML file, we highly suggest to stick to this rather lenghty notation instead of nesting structs.
 
 To override configuration values using environment variables, use the prefix
-`ALMIGHTY_` and replace the dots in the variables names with underscores.
+`F8_` and replace the dots in the variables names with underscores.
 
-For example to override `postgres.password`, set the environment variable `ALMIGHTY_POSTGRES_PASSWORD` to the value of you liking.
+For example to override `postgres.password`, set the environment variable `F8_POSTGRES_PASSWORD` to the value of you liking.
 
 NOTE: Environment variables override the default values and the ones you've set in your config file.
 
 ==== Development
 
-Only files `+./*.go+`, `+./design/*.go+`, `+./models/*.go+` and `+./tool/alm-cli/main.go+` should be edited.
+Only files `+./*.go+`, `+./design/*.go+`, `+./models/*.go+` and `+./tool/wit-cli/main.go+` should be edited.
 
 These files and directory are generated:
 
@@ -360,26 +360,26 @@ NOTE: The CLI needs the API Server which was started on executing `make dev`  to
 
 Generate a token for future use.
 ----
-./bin/alm-cli generate login -H localhost:8080 --pp
+./bin/wit-cli generate login -H localhost:8080 --pp
 ----
 
 You should get Token in response, save this token in your favourite editor as you need to use this token for POST API calls
 
 Create a work item type (using above token).
 ----
-./bin/alm-cli create workitemtype --key "<GENERATED TOKEN>" --payload '{"fields":{"system.owner":{"Type":{"Kind":"user"},"Required":true},"system.state":{"Type":{"Kind":"string"},"Required":false}},"name":"Epic"}' -H localhost:8080 --pp
+./bin/wit-cli create workitemtype --key "<GENERATED TOKEN>" --payload '{"fields":{"system.owner":{"Type":{"Kind":"user"},"Required":true},"system.state":{"Type":{"Kind":"string"},"Required":false}},"name":"Epic"}' -H localhost:8080 --pp
 ----
 Note: Work Item Type `Name` is unique. If one tries to create another work item type with same name, error will be trown.
 
 Retrieve the work item type.
 
 ----
-$ ./bin/alm-cli show workitemtype --name "Epic" -H localhost:8080
+$ ./bin/wit-cli show workitemtype --name "Epic" -H localhost:8080
 ----
 
 List all available work item types.
 ----
-$ ./bin/alm-cli list workitemtype -H localhost:8080 --pp
+$ ./bin/wit-cli list workitemtype -H localhost:8080 --pp
 ----
 
 Create a work item.
@@ -388,13 +388,13 @@ Based on WorkItemType created above, we can create WorkItem.
 We need to use name of work item type in the `type` field below.
 
 ----
-$ ./bin/alm-cli create workitem --key "<GENERATED TOKEN>" --payload '{"type": "Epic", "fields": { "system.owner": "tmaeder", "system.state": "open" }}' -H localhost:8080
+$ ./bin/wit-cli create workitem --key "<GENERATED TOKEN>" --payload '{"type": "Epic", "fields": { "system.owner": "tmaeder", "system.state": "open" }}' -H localhost:8080
 ----
 
 Retrieve the work item.
 
 ----
-$ ./bin/alm-cli show workitem --id 1 -H localhost:8080 --pp
+$ ./bin/wit-cli show workitem --id 1 -H localhost:8080 --pp
 ----
 
 
@@ -410,11 +410,11 @@ System defined Work Item Types are
 Use any one of above to create Work Item based on that type.
 Following example creates a Work Item of type `userstory`
 ----
-$ ./bin/alm-cli create workitem --key "<GENERATED TOKEN>" --payload '{ "data": { "attributes": { "system.owner": "tmaeder", "system.state": "open", "system.title": "Example of an Epic", "version": "1" }, "relationships": { "baseType": { "data": { "id": "Epic", "type": "workitemtypes" } } }, "type": "workitems" } }' -H localhost:8080
+$ ./bin/wit-cli create workitem --key "<GENERATED TOKEN>" --payload '{ "data": { "attributes": { "system.owner": "tmaeder", "system.state": "open", "system.title": "Example of an Epic", "version": "1" }, "relationships": { "baseType": { "data": { "id": "Epic", "type": "workitemtypes" } } }, "type": "workitems" } }' -H localhost:8080
 ----
 
 In response you should get ID of created item, using that you can retrieve the work item.
 
 ----
-$ ./bin/alm-cli show workitem --id <ID> -H localhost:8080 --pp
+$ ./bin/wit-cli show workitem --id <ID> -H localhost:8080 --pp
 ----
diff --git a/assets/index.html b/assets/index.html
index 906e0c8..c1389bf 100644
--- a/assets/index.html
+++ b/assets/index.html
@@ -7,7 +7,7 @@
           <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
   <body>
 	<div class="container-fluid">
-	    <h1>almighty tokens <small id="response">Loading..</small></h1>
+	    <h1>Fabric8-wit tokens <small id="response">Loading..</small></h1>
 
 		<div id="tokens">
 			<div class="token" style="display:none">
diff --git a/auth/authz_blackbox_test.go b/auth/authz_blackbox_test.go
index 25fa1d5..ad1fdfb 100644
--- a/auth/authz_blackbox_test.go
+++ b/auth/authz_blackbox_test.go
@@ -519,7 +519,7 @@ func getClientIDAndEndpoint(t *testing.T) (string, string) {
 
 func getProtectedAPITokenOK(t *testing.T) string {
 	r := &goa.RequestData{
-		Request: &http.Request{Host: "demo.api.almighty.io"},
+		Request: &http.Request{Host: "demo.api.openshift.io"},
 	}
 
 	endpoint, err := configuration.GetKeycloakEndpointToken(r)
diff --git a/codebase/codebase_test.go b/codebase/codebase_test.go
index f5a6d87..6ae2dbb 100644
--- a/codebase/codebase_test.go
+++ b/codebase/codebase_test.go
@@ -115,8 +115,8 @@ func (test *TestCodebaseRepository) TestListCodebases() {
 	// given
 	spaceID := space.SystemSpace
 	repo := codebase.NewCodebaseRepository(test.DB)
-	codebase1 := newCodebase(spaceID, "golang-default", "my-used-last-workspace", "git", "git@github.com:almighty/almighty-core.git")
-	codebase2 := newCodebase(spaceID, "python-default", "my-used-last-workspace", "git", "git@github.com:aslakknutsen/almighty-core.git")
+	codebase1 := newCodebase(spaceID, "golang-default", "my-used-last-workspace", "git", "git@github.com:fabric8-services/fabric8-wit.git")
+	codebase2 := newCodebase(spaceID, "python-default", "my-used-last-workspace", "git", "git@github.com:aslakknutsen/fabric8-wit.git")
 
 	test.createCodebase(codebase1)
 	test.createCodebase(codebase2)
@@ -138,7 +138,7 @@ func (test *TestCodebaseRepository) TestExistsCodebase() {
 		// given
 		spaceID := space.SystemSpace
 		repo := codebase.NewCodebaseRepository(test.DB)
-		codebase := newCodebase(spaceID, "lisp-default", "my-used-lisp-workspace", "git", "git@github.com:hectorj2f/almighty-core.git")
+		codebase := newCodebase(spaceID, "lisp-default", "my-used-lisp-workspace", "git", "git@github.com:hectorj2f/fabric8-wit.git")
 		test.createCodebase(codebase)
 		// when
 		exists, err := repo.Exists(context.Background(), codebase.ID.String())
@@ -163,7 +163,7 @@ func (test *TestCodebaseRepository) TestLoadCodebase() {
 	// given
 	spaceID := space.SystemSpace
 	repo := codebase.NewCodebaseRepository(test.DB)
-	codebase := newCodebase(spaceID, "golang-default", "my-used-last-workspace", "git", "git@github.com:aslakknutsen/almighty-core.git")
+	codebase := newCodebase(spaceID, "golang-default", "my-used-last-workspace", "git", "git@github.com:aslakknutsen/fabric8-wit.git")
 	test.createCodebase(codebase)
 	// when
 	loadedCodebase, err := repo.Load(context.Background(), codebase.ID)
diff --git a/configuration/configuration.go b/configuration/configuration.go
index 5e5ec15..ca274b0 100644
--- a/configuration/configuration.go
+++ b/configuration/configuration.go
@@ -102,7 +102,7 @@ func NewConfigurationData(configFilePath string) (*ConfigurationData, error) {
 	c := ConfigurationData{
 		v: viper.New(),
 	}
-	c.v.SetEnvPrefix("ALMIGHTY")
+	c.v.SetEnvPrefix("F8")
 	c.v.AutomaticEnv()
 	c.v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
 	c.v.SetTypeByDefaultValue(true)
@@ -121,7 +121,7 @@ func NewConfigurationData(configFilePath string) (*ConfigurationData, error) {
 
 func getConfigFilePath() string {
 	// This was either passed as a env var Or, set inside main.go from --config
-	envConfigPath, ok := os.LookupEnv("ALMIGHTY_CONFIG_FILE_PATH")
+	envConfigPath, ok := os.LookupEnv("F8_CONFIG_FILE_PATH")
 	if !ok {
 		return ""
 	}
@@ -625,7 +625,7 @@ func (c *ConfigurationData) IsLogJSON() bool {
 }
 
 // GetValidRedirectURLs returns the RegEx of valid redirect URLs for auth requests
-// If the ALMIGHTY_REDIRECT_VALID env var is not set then in Dev Mode all redirects allowed - *
+// If the F8_REDIRECT_VALID env var is not set then in Dev Mode all redirects allowed - *
 // In prod mode the default regex will be returned
 func (c *ConfigurationData) GetValidRedirectURLs(req *goa.RequestData) (string, error) {
 	if c.v.IsSet(varValidRedirectURLs) {
@@ -727,7 +727,7 @@ vwIDAQAB
 	defaultCheStarterURL            = "che-server"
 
 	// DefaultValidRedirectURLs is a regex to be used to whitelist redirect URL for auth
-	// If the ALMIGHTY_REDIRECT_VALID env var is not set then in Dev Mode all redirects allowed - *
+	// If the F8_REDIRECT_VALID env var is not set then in Dev Mode all redirects allowed - *
 	// In prod mode the following regex will be used by default:
 	DefaultValidRedirectURLs = "^(https|http)://([^/]+[.])?(?i:openshift[.]io)(/.*)?$" // *.openshift.io/*
 	devModeValidRedirectURLs = ".*"
diff --git a/configuration/configuration_blackbox_test.go b/configuration/configuration_blackbox_test.go
index 3cdd5aa..c3fbe12 100644
--- a/configuration/configuration_blackbox_test.go
+++ b/configuration/configuration_blackbox_test.go
@@ -55,13 +55,13 @@ func resetConfiguration(configPath string) {
 
 func TestGetKeycloakEndpointSetByUrlEnvVaribaleOK(t *testing.T) {
 	resource.Require(t, resource.UnitTest)
-	env := os.Getenv("ALMIGHTY_KEYCLOAK_URL")
+	env := os.Getenv("F8_KEYCLOAK_URL")
 	defer func() {
-		os.Setenv("ALMIGHTY_KEYCLOAK_URL", env)
+		os.Setenv("F8_KEYCLOAK_URL", env)
 		resetConfiguration(defaultValuesConfigFilePath)
 	}()
 
-	os.Setenv("ALMIGHTY_KEYCLOAK_URL", "http://xyz.io")
+	os.Setenv("F8_KEYCLOAK_URL", "http://xyz.io")
 	resetConfiguration(defaultValuesConfigFilePath)
 
 	url, err := config.GetKeycloakEndpointAuth(reqLong)
@@ -101,7 +101,7 @@ func TestGetKeycloakEndpointAdminDevModeOK(t *testing.T) {
 
 func TestGetKeycloakEndpointAdminSetByEnvVaribaleOK(t *testing.T) {
 	resource.Require(t, resource.UnitTest)
-	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "ALMIGHTY_KEYCLOAK_ENDPOINT_ADMIN", config.GetKeycloakEndpointAdmin)
+	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "F8_KEYCLOAK_ENDPOINT_ADMIN", config.GetKeycloakEndpointAdmin)
 }
 
 func TestGetKeycloakEndpointAuthzResourcesetDevModeOK(t *testing.T) {
@@ -112,7 +112,7 @@ func TestGetKeycloakEndpointAuthzResourcesetDevModeOK(t *testing.T) {
 
 func TestGetKeycloakEndpointAuthzResourcesetSetByEnvVaribaleOK(t *testing.T) {
 	resource.Require(t, resource.UnitTest)
-	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "ALMIGHTY_KEYCLOAK_ENDPOINT_AUTHZ_RESOURCESET", config.GetKeycloakEndpointAuthzResourceset)
+	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "F8_KEYCLOAK_ENDPOINT_AUTHZ_RESOURCESET", config.GetKeycloakEndpointAuthzResourceset)
 }
 
 func TestGetKeycloakEndpointClientsDevModeOK(t *testing.T) {
@@ -123,7 +123,7 @@ func TestGetKeycloakEndpointClientsDevModeOK(t *testing.T) {
 
 func TestGetKeycloakEndpoinClientsSetByEnvVaribaleOK(t *testing.T) {
 	resource.Require(t, resource.UnitTest)
-	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "ALMIGHTY_KEYCLOAK_ENDPOINT_CLIENTS", config.GetKeycloakEndpointClients)
+	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "F8_KEYCLOAK_ENDPOINT_CLIENTS", config.GetKeycloakEndpointClients)
 }
 
 func TestGetKeycloakEndpointAuthDevModeOK(t *testing.T) {
@@ -134,7 +134,7 @@ func TestGetKeycloakEndpointAuthDevModeOK(t *testing.T) {
 
 func TestGetKeycloakEndpointAuthSetByEnvVaribaleOK(t *testing.T) {
 	resource.Require(t, resource.UnitTest)
-	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "ALMIGHTY_KEYCLOAK_ENDPOINT_AUTH", config.GetKeycloakEndpointAuth)
+	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "F8_KEYCLOAK_ENDPOINT_AUTH", config.GetKeycloakEndpointAuth)
 }
 
 func TestGetKeycloakEndpointLogoutDevModeOK(t *testing.T) {
@@ -145,7 +145,7 @@ func TestGetKeycloakEndpointLogoutDevModeOK(t *testing.T) {
 
 func TestGetKeycloakEndpointLogoutSetByEnvVaribaleOK(t *testing.T) {
 	resource.Require(t, resource.UnitTest)
-	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "ALMIGHTY_KEYCLOAK_ENDPOINT_LOGOUT", config.GetKeycloakEndpointLogout)
+	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "F8_KEYCLOAK_ENDPOINT_LOGOUT", config.GetKeycloakEndpointLogout)
 }
 
 func TestGetKeycloakEndpointTokenOK(t *testing.T) {
@@ -156,7 +156,7 @@ func TestGetKeycloakEndpointTokenOK(t *testing.T) {
 
 func TestGetKeycloakEndpointTokenSetByEnvVaribaleOK(t *testing.T) {
 	resource.Require(t, resource.UnitTest)
-	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "ALMIGHTY_KEYCLOAK_ENDPOINT_TOKEN", config.GetKeycloakEndpointToken)
+	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "F8_KEYCLOAK_ENDPOINT_TOKEN", config.GetKeycloakEndpointToken)
 }
 
 func TestGetKeycloakEndpointUserInfoOK(t *testing.T) {
@@ -167,7 +167,7 @@ func TestGetKeycloakEndpointUserInfoOK(t *testing.T) {
 
 func TestGetKeycloakEndpointUserInfoSetByEnvVaribaleOK(t *testing.T) {
 	resource.Require(t, resource.UnitTest)
-	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "ALMIGHTY_KEYCLOAK_ENDPOINT_USERINFO", config.GetKeycloakEndpointUserInfo)
+	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "F8_KEYCLOAK_ENDPOINT_USERINFO", config.GetKeycloakEndpointUserInfo)
 }
 
 func TestGetKeycloakEndpointEntitlementOK(t *testing.T) {
@@ -178,7 +178,7 @@ func TestGetKeycloakEndpointEntitlementOK(t *testing.T) {
 
 func TestGetKeycloakEndpointEntitlementSetByEnvVaribaleOK(t *testing.T) {
 	resource.Require(t, resource.UnitTest)
-	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "ALMIGHTY_KEYCLOAK_ENDPOINT_ENTITLEMENT", config.GetKeycloakEndpointEntitlement)
+	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "F8_KEYCLOAK_ENDPOINT_ENTITLEMENT", config.GetKeycloakEndpointEntitlement)
 }
 
 func TestGetKeycloakEndpointBrokerOK(t *testing.T) {
@@ -189,7 +189,7 @@ func TestGetKeycloakEndpointBrokerOK(t *testing.T) {
 
 func TestGetKeycloakEndpointBrokerSetByEnvVaribaleOK(t *testing.T) {
 	resource.Require(t, resource.UnitTest)
-	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "ALMIGHTY_KEYCLOAK_ENDPOINT_BROKER", config.GetKeycloakEndpointBroker)
+	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "F8_KEYCLOAK_ENDPOINT_BROKER", config.GetKeycloakEndpointBroker)
 }
 
 func TestGetKeycloakUserInfoEndpointOK(t *testing.T) {
@@ -200,7 +200,7 @@ func TestGetKeycloakUserInfoEndpointOK(t *testing.T) {
 
 func TestGetKeycloakUserInfoEndpointOKrSetByEnvVaribaleOK(t *testing.T) {
 	resource.Require(t, resource.UnitTest)
-	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "ALMIGHTY_KEYCLOAK_ENDPOINT_ACCOUNT", config.GetKeycloakAccountEndpoint)
+	checkGetKeycloakEndpointSetByEnvVaribaleOK(t, "F8_KEYCLOAK_ENDPOINT_ACCOUNT", config.GetKeycloakAccountEndpoint)
 }
 
 func checkGetKeycloakEndpointOK(t *testing.T, expectedEndpoint string, getEndpoint func(req *goa.RequestData) (string, error)) {
@@ -269,7 +269,7 @@ func TestGetMaxHeaderSizeUsingDefaults(t *testing.T) {
 
 func TestGetMaxHeaderSizeSetByEnvVaribaleOK(t *testing.T) {
 	resource.Require(t, resource.UnitTest)
-	envName := "ALMIGHTY_HEADER_MAXLENGTH"
+	envName := "F8_HEADER_MAXLENGTH"
 	envValue := time.Now().Unix()
 	env := os.Getenv(envName)
 	defer func() {
@@ -286,7 +286,7 @@ func TestGetMaxHeaderSizeSetByEnvVaribaleOK(t *testing.T) {
 }
 
 func generateEnvKey(yamlKey string) string {
-	return "ALMIGHTY_" + strings.ToUpper(strings.Replace(yamlKey, ".", "_", -1))
+	return "F8_" + strings.ToUpper(strings.Replace(yamlKey, ".", "_", -1))
 }
 
 func checkGetKeycloakEndpointSetByEnvVaribaleOK(t *testing.T, envName string, getEndpoint func(req *goa.RequestData) (string, error)) {
diff --git a/configuration/configuration_whitebox_test.go b/configuration/configuration_whitebox_test.go
index 66a9dc4..dfe3d2e 100644
--- a/configuration/configuration_whitebox_test.go
+++ b/configuration/configuration_whitebox_test.go
@@ -87,7 +87,7 @@ func TestGetKeycloakURLForTooShortHostFails(t *testing.T) {
 func TestKeycloakRealmInDevModeCanBeOverridden(t *testing.T) {
 	resource.Require(t, resource.UnitTest)
 
-	key := "ALMIGHTY_KEYCLOAK_REALM"
+	key := "F8_KEYCLOAK_REALM"
 	realEnvValue := os.Getenv(key)
 
 	os.Unsetenv(key)
@@ -107,7 +107,7 @@ func TestKeycloakRealmInDevModeCanBeOverridden(t *testing.T) {
 func TestGetLogLevelOK(t *testing.T) {
 	resource.Require(t, resource.UnitTest)
 
-	key := "ALMIGHTY_LOG_LEVEL"
+	key := "F8_LOG_LEVEL"
 	realEnvValue := os.Getenv(key)
 
 	os.Unsetenv(key)
@@ -127,7 +127,7 @@ func TestGetLogLevelOK(t *testing.T) {
 func TestValidRedirectURLsInDevModeCanBeOverridden(t *testing.T) {
 	resource.Require(t, resource.UnitTest)
 
-	key := "ALMIGHTY_REDIRECT_VALID"
+	key := "F8_REDIRECT_VALID"
 	realEnvValue := os.Getenv(key)
 
 	os.Unsetenv(key)
diff --git a/controller/user_test.go b/controller/user_test.go
index 7b155b7..d59d360 100644
--- a/controller/user_test.go
+++ b/controller/user_test.go
@@ -58,7 +58,7 @@ func (rest *TestUserREST) SetupSuite() {
 
 func (rest *TestUserREST) newUserController(identity *account.Identity, user *account.User) *UserController {
 	priv, _ := almtoken.ParsePrivateKey([]byte(almtoken.RSAPrivateKey))
-	return NewUserController(goa.New("alm-test"), newGormTestBase(identity, user), almtoken.NewManagerWithPrivateKey(priv), &rest.config)
+	return NewUserController(goa.New("wit-test"), newGormTestBase(identity, user), almtoken.NewManagerWithPrivateKey(priv), &rest.config)
 }
 
 func (rest *TestUserREST) TestCurrentAuthorizedMissingUUID() {
diff --git a/design/api.go b/design/api.go
index df3ea5c..c80d3c3 100644
--- a/design/api.go
+++ b/design/api.go
@@ -5,11 +5,11 @@ import (
 	a "github.com/goadesign/goa/design/apidsl"
 )
 
-var _ = a.API("alm", func() {
-	a.Title("ALMighty: One to rule them all")
+var _ = a.API("wit", func() {
+	a.Title("Fabric8-wit: One to rule them all")
 	a.Description("The next big thing")
 	a.Version("1.0")
-	a.Host("almighty.io")
+	a.Host("openshift.io")
 	a.Scheme("http")
 	a.BasePath("/api")
 	a.Consumes("application/json")
@@ -19,7 +19,7 @@ var _ = a.API("alm", func() {
 		a.Name("Apache License Version 2.0")
 		a.URL("http://www.apache.org/licenses/LICENSE-2.0")
 	})
-	a.Origin("/[.*almighty.io|localhost]/", func() {
+	a.Origin("/[.*openshift.io|localhost]/", func() {
 		a.Methods("GET", "POST", "PUT", "PATCH", "DELETE")
 		a.Headers("X-Request-Id", "Content-Type", "Authorization", "If-None-Match", "If-Modified-Since")
 		a.MaxAge(600)
diff --git a/design/search.go b/design/search.go
index ff98b27..58cc13e 100644
--- a/design/search.go
+++ b/design/search.go
@@ -29,7 +29,7 @@ var _ = a.Resource("search", func() {
 			a.Param("q", d.String,
 				`Following are valid input for search query
 				1) "id:100" :- Look for work item hainvg id 100
-				2) "url:http://demo.almighty.io/details/500" :- Search on WI having id 500 and check 
+				2) "url:http://demo.openshift.io/details/500" :- Search on WI having id 500 and check 
 					if this URL is mentioned in searchable columns of work item
 				3) "simple keywords separated by space" :- Search in Work Items based on these keywords.`)
 			a.Param("page[offset]", d.String, "Paging start position") // #428
diff --git a/design/user_types.go b/design/user_types.go
index 9c4b790..fc8dd88 100644
--- a/design/user_types.go
+++ b/design/user_types.go
@@ -66,7 +66,7 @@ var UpdateTrackerAlternatePayload = a.Type("UpdateTrackerAlternatePayload", func
 // CreateTrackerQueryAlternatePayload defines the structure of tracker query payload for create
 var CreateTrackerQueryAlternatePayload = a.Type("CreateTrackerQueryAlternatePayload", func() {
 	a.Attribute("query", d.String, "Search query", func() {
-		a.Example("is:open is:issue user:almighty")
+		a.Example("is:open is:issue user:wit")
 		a.MinLength(1)
 	})
 	a.Attribute("schedule", d.String, "Schedule for fetch and import", func() {
@@ -87,7 +87,7 @@ var CreateTrackerQueryAlternatePayload = a.Type("CreateTrackerQueryAlternatePayl
 // UpdateTrackerQueryAlternatePayload defines the structure of tracker query payload for update
 var UpdateTrackerQueryAlternatePayload = a.Type("UpdateTrackerQueryAlternatePayload", func() {
 	a.Attribute("query", d.String, "Search query", func() {
-		a.Example("is:open is:issue user:almighty")
+		a.Example("is:open is:issue user:wit")
 		a.MinLength(1)
 	})
 	a.Attribute("schedule", d.String, "Schedule for fetch and import", func() {
diff --git a/design/work_item_link.go b/design/work_item_link.go
index 34f5cac..043dfd9 100644
--- a/design/work_item_link.go
+++ b/design/work_item_link.go
@@ -8,7 +8,7 @@ import (
 // workItemLinkLinks has `self` as of now according to http://jsonapi.org/format/#fetching-resources
 var workItemLinkLinks = a.Type("WorkItemLinkLinks", func() {
 	a.Attribute("self", d.String, func() {
-		a.Example("http://api.almighty.io/api/workitemlinks/2d98c73d-6969-4ea6-958a-812c832b6c18")
+		a.Example("http://api.openshift.io/api/workitemlinks/2d98c73d-6969-4ea6-958a-812c832b6c18")
 	})
 	a.Required("self")
 })
diff --git a/design/work_item_link_category.go b/design/work_item_link_category.go
index 04eca00..d162056 100644
--- a/design/work_item_link_category.go
+++ b/design/work_item_link_category.go
@@ -8,7 +8,7 @@ import (
 // workItemLinkCategoryLinks has `self` as of now according to http://jsonapi.org/format/#fetching-resources
 var workItemLinkCategoryLinks = a.Type("WorkItemLinkCategoryLinks", func() {
 	a.Attribute("self", d.String, func() {
-		a.Example("http://api.almighty.io/api/workitemlinkcategories/2d98c73d-6969-4ea6-958a-812c832b6c18")
+		a.Example("http://api.openshift.io/api/workitemlinkcategories/2d98c73d-6969-4ea6-958a-812c832b6c18")
 	})
 	a.Required("self")
 })
diff --git a/design/work_item_link_type.go b/design/work_item_link_type.go
index 94ea24d..3fed6ca 100644
--- a/design/work_item_link_type.go
+++ b/design/work_item_link_type.go
@@ -111,7 +111,7 @@ var relationWorkItemLinkTypeData = a.Type("RelationWorkItemLinkTypeData", func()
 // workItemLinkTypeLinks has `self` as of now according to http://jsonapi.org/format/#fetching-resources
 var workItemLinkTypeLinks = a.Type("WorkItemLinkTypeLinks", func() {
 	a.Attribute("self", d.String, func() {
-		a.Example("http://api.almighty.io/api/workitemlinktypes/2d98c73d-6969-4ea6-958a-812c832b6c18")
+		a.Example("http://api.openshift.io/api/workitemlinktypes/2d98c73d-6969-4ea6-958a-812c832b6c18")
 	})
 	a.Required("self")
 })
diff --git a/design/workitems.go b/design/workitems.go
index 0fb3fcd..ee35939 100644
--- a/design/workitems.go
+++ b/design/workitems.go
@@ -62,7 +62,7 @@ var baseTypeData = a.Type("BaseTypeData", func() {
 // workItemLinks has `self` as of now according to http://jsonapi.org/format/#fetching-resources
 var workItemLinks = a.Type("WorkItemLinks", func() {
 	a.Attribute("self", d.String, func() {
-		a.Example("http://api.almighty.io/api/workitems.2/1")
+		a.Example("http://api.openshift.io/api/workitems.2/1")
 	})
 	a.Required("self")
 })
diff --git a/design/workitemtype.go b/design/workitemtype.go
index 4ba9389..401ee4b 100644
--- a/design/workitemtype.go
+++ b/design/workitemtype.go
@@ -87,7 +87,7 @@ var workItemTypeData = a.Type("WorkItemTypeData", func() {
 // workItemTypeLinks has `self` as of now according to http://jsonapi.org/format/#fetching-resources
 var workItemTypeLinks = a.Type("WorkItemTypeLinks", func() {
 	a.Attribute("self", d.String, func() {
-		a.Example("http://api.almighty.io/api/workitemtypes/bug")
+		a.Example("http://api.openshift.io/api/workitemtypes/bug")
 	})
 	a.Required("self")
 })
diff --git a/docker-compose.yml b/docker-compose.yml
index fc78e7a..e8a0e26 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
     image: fabric8-services/fabric8-wit:latest
     command: -config /usr/local/alm/etc/config.yaml
     environment:
-      ALMIGHTY_POSTGRES_HOST: db
+      F8_POSTGRES_HOST: db
     ports:
       - "8080:8080"
     networks:
diff --git a/docs/development/ide-setup.adoc b/docs/development/ide-setup.adoc
index 96457d5..401f958 100644
--- a/docs/development/ide-setup.adoc
+++ b/docs/development/ide-setup.adoc
@@ -1,4 +1,4 @@
-= Setting up your IDE for ALMighty Development
+= Setting up your IDE for Fabric8-wit Development
 :toc:
 :toc-placement!:
 :sectnums:
@@ -10,9 +10,9 @@ toc::[]
 
 === Installation [[vscodeinstallation]]
 
-Download and install the appropriate distribution of Visual Studio Code from link:https://code.visualstudio.com/download[Visual Studio Code Download site] 
+Download and install the appropriate distribution of Visual Studio Code from link:https://code.visualstudio.com/download[Visual Studio Code Download site]
 
-=== Configuration [[vscodeconfiguration]] 
+=== Configuration [[vscodeconfiguration]]
 
 . Ensure your `GOPATH` environment variable is correctly set.
 . Install `gometalinter`
@@ -26,6 +26,6 @@ If you are on Windows, `gometalinter --install` may fail. with a lot of erros ab
 . Launch Visual Studio Code from a location where your `GOPATH` is correctly set. We recommend changing to the `src\github.com\fabric8-services\fabric8-wit` directory, and executing `code .` which will launch VS Code, with the FABRIC8-WIT project open.
 . Open any `.go` file by clicking on it. An info dialog box will open at the top of the screen. Click on _Show Recommendations_ and click on the green _Install_ button next to the _Go_ extension from `lukehoban`.
 . Click the blue _Enable_ button, and then ok to restart Visual Studio Code.
-. On restart, you will notice that a Yellow  _Analysis Tools Missing_ warning appears in the status bar. Click it, and then click /Install/ to install the Go tools that Visual Studio Code calls out to in order to provide actions such as refactoring, autocomplete etc.  
+. On restart, you will notice that a Yellow  _Analysis Tools Missing_ warning appears in the status bar. Click it, and then click /Install/ to install the Go tools that Visual Studio Code calls out to in order to provide actions such as refactoring, autocomplete etc.
 
 If you want to read more about using Go with VS Code, check out the link:https://github.com/Microsoft/vscode-go[plugin README].
diff --git a/examples/workitemtype.adoc b/examples/workitemtype.adoc
index d34c0d3..b91e803 100644
--- a/examples/workitemtype.adoc
+++ b/examples/workitemtype.adoc
@@ -11,13 +11,13 @@
 The following should fail as nothing is there (yet):
 
 ----
-./bin/alm-cli show workitemtype --name "Epic" -H localhost:8080 --pp
+./bin/wit-cli show workitemtype --name "Epic" -H localhost:8080 --pp
 ----
 
 Should create 1 WIT with `name=Epic`:
 
 ----
-./bin/alm-cli create workitemtype --key "GENERATED_TOKEN" --payload '{"extendedTypeName":null,"fields":{"system.owner":{"Type":{"Kind":"user"},"Required":true},"system.state":{"Type":{"Kind":"string"},"Required":false}},"name":"Epic"}' -H localhost:8080 --pp
+./bin/wit-cli create workitemtype --key "GENERATED_TOKEN" --payload '{"extendedTypeName":null,"fields":{"system.owner":{"Type":{"Kind":"user"},"Required":true},"system.state":{"Type":{"Kind":"string"},"Required":false}},"name":"Epic"}' -H localhost:8080 --pp
 ----
 
 == Show newly created "Epic"
@@ -25,7 +25,7 @@ Should create 1 WIT with `name=Epic`:
 Should show you newly created item type:
 
 ----
-./bin/alm-cli show workitemtype --name "Epic" -H localhost:8080 --pp
+./bin/wit-cli show workitemtype --name "Epic" -H localhost:8080 --pp
 ----
 
 == Create "Issue" Work Item Type
@@ -33,13 +33,13 @@ Should show you newly created item type:
 Create another item type:
 
 ----
-./bin/alm-cli create workitemtype --key "GENERATED_TOKEN" --payload '{"extendedTypeName":null,"fields":{"system.owner":{"Type":{"Kind":"user"},"Required":true},"system.duration":{"Type":{"Kind":"integer"},"Required":false}},"name":"Issue"}' -H localhost:8080 --pp
+./bin/wit-cli create workitemtype --key "GENERATED_TOKEN" --payload '{"extendedTypeName":null,"fields":{"system.owner":{"Type":{"Kind":"user"},"Required":true},"system.duration":{"Type":{"Kind":"integer"},"Required":false}},"name":"Issue"}' -H localhost:8080 --pp
 ----
 
 Retrieve newly created `Issue` work item type:
 
 ----
-./bin/alm-cli show workitemtype --name "Issue" -H localhost:8080 --pp
+./bin/wit-cli show workitemtype --name "Issue" -H localhost:8080 --pp
 ----
 
 Should fail - create item type based on pre-existing item type because `system.state` does not match to parent item type:
@@ -47,7 +47,7 @@ Should fail - create item type based on pre-existing item type because `system.s
 (The `system.state` must not be of type `float` but of type `string`.)
 
 ----
-./bin/alm-cli create workitemtype --key "GENERATED_TOKEN" --payload '{"extendedTypeName":"Epic","fields":{"system.owner":{"Type":{"Kind":"user"},"Required":true},"system.state":{"Type":{"Kind":"float"},"Required":false}},"name":"anotherEpic"}' -H localhost:8080 --pp
+./bin/wit-cli create workitemtype --key "GENERATED_TOKEN" --payload '{"extendedTypeName":"Epic","fields":{"system.owner":{"Type":{"Kind":"user"},"Required":true},"system.state":{"Type":{"Kind":"float"},"Required":false}},"name":"anotherEpic"}' -H localhost:8080 --pp
 ----
 
 Should create item type based on pre-existing item type:
@@ -55,7 +55,7 @@ Should create item type based on pre-existing item type:
 (Now `system.state` has the correct type of `string`.)
 
 ----
-./bin/alm-cli create workitemtype --key "GENERATED_TOKEN" --payload '{"extendedTypeName":"Epic","fields":{"system.owner":{"Type":{"Kind":"user"},"Required":true},"system.state":{"Type":{"Kind":"string"},"Required":false}},"name":"anotherEpic"}' -H localhost:8080 --pp
+./bin/wit-cli create workitemtype --key "GENERATED_TOKEN" --payload '{"extendedTypeName":"Epic","fields":{"system.owner":{"Type":{"Kind":"user"},"Required":true},"system.state":{"Type":{"Kind":"string"},"Required":false}},"name":"anotherEpic"}' -H localhost:8080 --pp
 ----
 
 == List all work item types that we created
@@ -63,5 +63,5 @@ Should create item type based on pre-existing item type:
 Should list all Work Item Types:
 
 ----
-./bin/alm-cli list workitemtype -H localhost:8080 --pp
+./bin/wit-cli list workitemtype -H localhost:8080 --pp
 ----
diff --git a/jenkins/windows/make.bat b/jenkins/windows/make.bat
index 4b9a894..a1bda04 100644
--- a/jenkins/windows/make.bat
+++ b/jenkins/windows/make.bat
@@ -1,6 +1,6 @@
-:: Run "set ALMIGHTY_DEBUG=1" before calling this script to enable debug output.
+:: Run "set F8_DEBUG=1" before calling this script to enable debug output.
 :: This basically just outputs every command before executing it.
-@if not defined ALMIGHTY_DEBUG echo off
+@if not defined F8_DEBUG echo off
 
 :: This is a script to help have a CI system on a Windows host with no
 :: other requirement other than to have a CMD.
diff --git a/login/service_blackbox_test.go b/login/service_blackbox_test.go
index c796fe6..1e8b3ae 100644
--- a/login/service_blackbox_test.go
+++ b/login/service_blackbox_test.go
@@ -123,7 +123,7 @@ func (s *serviceBlackBoxTest) TestKeycloakAuthorizationRedirect() {
 	}
 
 	r := &goa.RequestData{
-		Request: &http.Request{Host: "demo.api.almighty.io"},
+		Request: &http.Request{Host: "demo.api.openshift.io"},
 	}
 	brokerEndpoint, err := s.configuration.GetKeycloakEndpointBroker(r)
 	require.Nil(s.T(), err)
@@ -398,7 +398,7 @@ func (s *serviceBlackBoxTest) TestInvalidState() {
 	require.Nil(s.T(), err)
 
 	r := &goa.RequestData{
-		Request: &http.Request{Host: "demo.api.almighty.io"},
+		Request: &http.Request{Host: "demo.api.openshift.io"},
 	}
 	brokerEndpoint, err := s.configuration.GetKeycloakEndpointBroker(r)
 	require.Nil(s.T(), err)
@@ -413,7 +413,7 @@ func (s *serviceBlackBoxTest) TestInvalidOAuthAuthorizationCode() {
 	// an invalid OAuth2.0 code, the access token exchange
 	// fails. In such a scenario, there is response redirection
 	// to the valid referer, ie, the URL where the request originated from.
-	// Currently, this should be something like https://demo.almighty.org/somepage/
+	// Currently, this should be something like https://demo.openshift.io/somepage/
 
 	resource.Require(s.T(), resource.Database)
 
@@ -429,7 +429,7 @@ func (s *serviceBlackBoxTest) TestInvalidOAuthAuthorizationCode() {
 
 	// The user clicks login while on ALM UI.
 	// Therefore the referer would be an ALM URL.
-	refererUrl := "https://alm-url.example.org/path"
+	refererUrl := "https://wit-url.example.org/path"
 	req.Header.Add("referer", refererUrl)
 
 	prms := url.Values{}
@@ -439,7 +439,7 @@ func (s *serviceBlackBoxTest) TestInvalidOAuthAuthorizationCode() {
 	require.Nil(s.T(), err)
 
 	r := &goa.RequestData{
-		Request: &http.Request{Host: "demo.api.almighty.io"},
+		Request: &http.Request{Host: "demo.api.openshift.io"},
 	}
 	brokerEndpoint, err := s.configuration.GetKeycloakEndpointBroker(r)
 	require.Nil(s.T(), err)
diff --git a/main.go b/main.go
index 00e7c90..dfc3cbd 100644
--- a/main.go
+++ b/main.go
@@ -60,7 +60,7 @@ func main() {
 		}
 	})
 	if !configSwitchIsSet {
-		if envConfigPath, ok := os.LookupEnv("ALMIGHTY_CONFIG_FILE_PATH"); ok {
+		if envConfigPath, ok := os.LookupEnv("F8_CONFIG_FILE_PATH"); ok {
 			configFilePath = envConfigPath
 		}
 	}
@@ -143,7 +143,7 @@ func main() {
 	}
 
 	// Create service
-	service := goa.New("alm")
+	service := goa.New("wit")
 
 	// Mount middleware
 	service.Use(middleware.RequestID())
diff --git a/migration/sql-files/009-drop-wit-trigger.sql b/migration/sql-files/009-drop-wit-trigger.sql
index 3b8e41b..e8a0a58 100644
--- a/migration/sql-files/009-drop-wit-trigger.sql
+++ b/migration/sql-files/009-drop-wit-trigger.sql
@@ -1,4 +1,4 @@
--- See https://github.com/almighty/almighty-core/issues/518 for an explanation
+-- See https://github.com/fabric8-services/fabric8-wit/issues/518 for an explanation
 -- why these triggers were problematic.
 DROP TRIGGER update_WI_after_WILT_trigger ON work_item_types;
-DROP FUNCTION update_WI_after_WIT();
\ No newline at end of file
+DROP FUNCTION update_WI_after_WIT();
diff --git a/openshift/core.app.yaml b/openshift/core.app.yaml
index fadc3f6..b9a37f5 100644
--- a/openshift/core.app.yaml
+++ b/openshift/core.app.yaml
@@ -32,82 +32,82 @@ objects:
         containers:
         - image: registry.devshift.net/fabric8-services/fabric8-wit:${IMAGE_TAG}
           env:
-          - name: ALMIGHTY_POSTGRES_HOST
+          - name: F8_POSTGRES_HOST
             valueFrom:
               secretKeyRef:
                 name: core
                 key: db.host
-          - name: ALMIGHTY_POSTGRES_PORT
+          - name: F8_POSTGRES_PORT
             valueFrom:
               secretKeyRef:
                 name: core
                 key: db.port
-          - name: ALMIGHTY_POSTGRES_USER
+          - name: F8_POSTGRES_USER
             valueFrom:
               secretKeyRef:
                 name: core
                 key: db.user
-          - name: ALMIGHTY_POSTGRES_PASSWORD
+          - name: F8_POSTGRES_PASSWORD
             valueFrom:
               secretKeyRef:
                 name: core
                 key: db.password
-          - name: ALMIGHTY_KEYCLOAK_REALM
+          - name: F8_KEYCLOAK_REALM
             valueFrom:
               secretKeyRef:
                 name: core
                 key: keycloak.realm
-          - name: ALMIGHTY_TOKEN_PUBLICKEY
+          - name: F8_TOKEN_PUBLICKEY
             valueFrom:
               secretKeyRef:
                 name: core
                 key: token.publickey
-          - name: ALMIGHTY_KEYCLOAK_SECRET
+          - name: F8_KEYCLOAK_SECRET
             valueFrom:
               secretKeyRef:
                 name: core
                 key: keycloak.secret
-          - name: ALMIGHTY_POSTGRES_SSLMODE
+          - name: F8_POSTGRES_SSLMODE
             valueFrom:
               configMapKeyRef:
                 name: core
                 key: postgres.sslmode
-          - name: ALMIGHTY_POSTGRES_CONNECTION_MAXIDLE
+          - name: F8_POSTGRES_CONNECTION_MAXIDLE
             valueFrom:
               configMapKeyRef:
                 name: core
                 key: postgres.connection.maxidle
-          - name: ALMIGHTY_POSTGRES_CONNECTION_MAXOPEN
+          - name: F8_POSTGRES_CONNECTION_MAXOPEN
             valueFrom:
               configMapKeyRef:
                 name: core
                 key: postgres.connection.maxopen
-          - name: ALMIGHTY_AUTH_NOTAPPROVED_REDIRECT
+          - name: F8_AUTH_NOTAPPROVED_REDIRECT
             valueFrom:
               configMapKeyRef:
                 name: core
                 key: auth_notapproved_redirect
-          - name: ALMIGHTY_TENANT_SERVICEURL
+          - name: F8_TENANT_SERVICEURL
             valueFrom:
               secretKeyRef:
                 name: core
                 key: tenantsvc.url
-          - name: ALMIGHTY_CHESTARTERURL
+          - name: F8_CHESTARTERURL
             valueFrom:
               configMapKeyRef:
                 name: core
                 key: chestarter.url
-          - name: ALMIGHTY_REDIRECT_VALID
+          - name: F8_REDIRECT_VALID
             valueFrom:
               configMapKeyRef:
                 name: core
                 key: redirect.valid
-          - name: ALMIGHTY_OPENSHIFT_TENANT_MASTERURL
+          - name: F8_OPENSHIFT_TENANT_MASTERURL
             valueFrom:
               configMapKeyRef:
                 name: core
                 key: openshift.tenant.masterurl
-          - name: ALMIGHTY_FEATURE_WORKITEM_REMOTE
+          - name: F8_FEATURE_WORKITEM_REMOTE
             valueFrom:
               configMapKeyRef:
                 name: core
diff --git a/remoteworkitem/github_test.go b/remoteworkitem/github_test.go
index e6ba1bb..2474dff 100644
--- a/remoteworkitem/github_test.go
+++ b/remoteworkitem/github_test.go
@@ -82,9 +82,9 @@ func TestGithubFetchWithRecording(t *testing.T) {
 	fetch := g.fetch(&f)
 	// then
 	i := <-fetch
-	assert.Contains(t, string(i.Content), `"html_url":"https://github.com/almighty-test/almighty-test-unit/issues/2"`)
+	assert.Contains(t, string(i.Content), `"html_url":"https://github.com/fabric8-wit-test/fabric8-wit-test-unit/issues/2"`)
 	assert.Contains(t, string(i.Content), `"body":"desc\n"`)
 	i2 := <-fetch
-	assert.Contains(t, string(i2.Content), `"html_url":"https://github.com/almighty-test/almighty-test-unit/issues/1"`)
+	assert.Contains(t, string(i2.Content), `"html_url":"https://github.com/fabric8-wit-test/fabric8-wit-test-unit/issues/1"`)
 	assert.Contains(t, string(i2.Content), `"body":"sample desc\n"`)
 }
diff --git a/remoteworkitem/remoteworkitem_test.go b/remoteworkitem/remoteworkitem_test.go
index d332f84..f51fe02 100644
--- a/remoteworkitem/remoteworkitem_test.go
+++ b/remoteworkitem/remoteworkitem_test.go
@@ -61,10 +61,10 @@ func TestGitHubIssueMapping(t *testing.T) {
 	var gitData = []remoteData{
 		// JSON data file of Github issue with assignee to test that the data is getting correctly Mapped through the Map function
 		// Github Issue API URL for the respective JSON data file to update the cache
-		{"github_issue_with_assignee.json", true, "http://api.github.com/repos/almighty-test/almighty-test-unit/issues/2"},
+		{"github_issue_with_assignee.json", true, "http://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2"},
 		// JSON data file of Github issue with assignee and label
 		// Issue API URL for the respective JSON file to update the cache
-		{"github_issue_with_assignee_labels.json", true, "https://api.github.com/repos/almighty-unit-test/almighty-test/issues/1"},
+		{"github_issue_with_assignee_labels.json", true, "https://api.github.com/repos/fabric8-wit-unit-test/fabric8-wit-test/issues/1"},
 	}
 	// when/then
 	for _, j := range gitData {
@@ -122,12 +122,12 @@ func TestFlattenGithubResponseMap(t *testing.T) {
 		// JSON data file of Github issue with assignee to test that the data
 		// is getting correctly Mapped through the Map function
 		// Github Issue API URL for the respective JSON data file to update the cache
-		{"github_issue_with_assignee.json", true, "http://api.github.com/repos/almighty-test/almighty-test-unit/issues/2"},
+		{"github_issue_with_assignee.json", true, "http://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2"},
 		// Github issue with assignee and label
-		{"github_issue_with_assignee_labels.json", true, "https://api.github.com/repos/almighty-unit-test/almighty-test/issues/1"},
+		{"github_issue_with_assignee_labels.json", true, "https://api.github.com/repos/fabric8-wit-unit-test/fabric8-wit-test/issues/1"},
 		// The Github issue URL doesn't exist. So, the mapping will not happen
 		// The map created from the Flatten will be empty
-		{"github_issue_invalid.json", false, "https://api.github.com/repos/almighty-unit-test/almighty-test/issues/255"},
+		{"github_issue_invalid.json", false, "https://api.github.com/repos/fabric8-wit-unit-test/fabric8-wit-test/issues/255"},
 	}
 
 	for _, data := range gitData {
@@ -157,10 +157,10 @@ func TestFlattenGithubResponseMapWithoutAssignee(t *testing.T) {
 	var gitData = []remoteData{
 		// Github data with labels and without assignee
 		// assignees field is skipped if that is an empty array
-		{"github_issue_with_labels.json", true, "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/3"},
+		{"github_issue_with_labels.json", true, "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/3"},
 		// The Github issue URL doesn't exist. So, the mapping will not happen
 		// The map created from the Flatten will be empty
-		{"github_issue_invalid.json", false, "https://api.github.com/repos/almighty-unit-test/almighty-test/issues/255"},
+		{"github_issue_invalid.json", false, "https://api.github.com/repos/fabric8-wit-unit-test/fabric8-wit-test/issues/255"},
 	}
 	// when/then
 	for _, data := range gitData {
diff --git a/remoteworkitem/trackeritem_repository_test.go b/remoteworkitem/trackeritem_repository_test.go
index cb1e66e..18bd44a 100644
--- a/remoteworkitem/trackeritem_repository_test.go
+++ b/remoteworkitem/trackeritem_repository_test.go
@@ -83,7 +83,7 @@ func (s *TrackerItemRepositorySuite) TearDownTest() {
 	s.clean()
 }
 
-var GitIssueWithAssignee = "http://api.github.com/repos/almighty-test/almighty-test-unit/issues/2"
+var GitIssueWithAssignee = "http://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2"
 
 func (s *TrackerItemRepositorySuite) TestConvertNewWorkItemWithExistingIdentities() {
 	// given
diff --git a/resource/require.go b/resource/require.go
index 599cfb5..1dbaca8 100644
--- a/resource/require.go
+++ b/resource/require.go
@@ -17,13 +17,13 @@ const (
 	// specify that unit tests shall be run. Unless this environment variable
 	// is explicitly set to evaluate to false ("0", "no", or "false"), unit
 	// tests are executed all the time.
-	UnitTest = "ALMIGHTY_RESOURCE_UNIT_TEST"
+	UnitTest = "F8_RESOURCE_UNIT_TEST"
 	// Database refers to the name of the environment variable that is used to
 	// specify that test can be run that require a database.
-	Database = "ALMIGHTY_RESOURCE_DATABASE"
+	Database = "F8_RESOURCE_DATABASE"
 	// Remote refers to the name of the environment variable that is used to
 	// specify that test can be run that require availability of some remote servers such as Keycloak.
-	Remote = "ALMIGHTY_RESOURCE_REMOTE"
+	Remote = "F8_RESOURCE_REMOTE"
 	// StSkipReasonValueFalse is the skip message for tests when an environment variable is present but evaluates to false.
 	StSkipReasonValueFalse = "Skipping test because environment variable %s evaluates to false: %s"
 	// StSkipReasonNotSet is the skip message for tests when an environment is not present.
@@ -42,7 +42,7 @@ func Require(t *testing.T, envVars ...string) {
 		v, isSet := os.LookupEnv(envVar)
 
 		// If we don't explicitly opt out from unit tests
-		// by specifying ALMIGHTY_RESOURCE_UNIT_TEST=0
+		// by specifying F8_RESOURCE_UNIT_TEST=0
 		// we're going to run them
 		if !isSet && envVar == UnitTest {
 			continue
diff --git a/test/data/github_fetch_test.yaml b/test/data/github_fetch_test.yaml
index 378dc18..5ac0cb5 100644
--- a/test/data/github_fetch_test.yaml
+++ b/test/data/github_fetch_test.yaml
@@ -17,12 +17,12 @@ interactions:
   "incomplete_results": false,
   "items": [
     {
-      "url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/2",
-      "repository_url": "https://api.github.com/repos/almighty-test/almighty-test-unit",
-      "labels_url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/2/labels{/name}",
-      "comments_url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/2/comments",
-      "events_url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/2/events",
-      "html_url": "https://github.com/almighty-test/almighty-test-unit/issues/2",
+      "url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2",
+      "repository_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit",
+      "labels_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2/labels{/name}",
+      "comments_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2/comments",
+      "events_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2/events",
+      "html_url": "https://github.com/fabric8-wit-test/fabric8-wit-test-unit/issues/2",
       "id": 176621784,
       "number": 2,
       "title": "map flatten : test case : with assignee",
@@ -99,12 +99,12 @@ interactions:
       "score": 1.0
     },
     {
-      "url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/1",
-      "repository_url": "https://api.github.com/repos/almighty-test/almighty-test-unit",
-      "labels_url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/1/labels{/name}",
-      "comments_url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/1/comments",
-      "events_url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/1/events",
-      "html_url": "https://github.com/almighty-test/almighty-test-unit/issues/1",
+      "url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/1",
+      "repository_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit",
+      "labels_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/1/labels{/name}",
+      "comments_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/1/comments",
+      "events_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/1/events",
+      "html_url": "https://github.com/fabric8-wit-test/fabric8-wit-test-unit/issues/1",
       "id": 176621042,
       "number": 1,
       "title": "map flatten test case : without assignee",
diff --git a/test/data/github_issue_mapping.json b/test/data/github_issue_mapping.json
index 3f8a612..487e253 100644
--- a/test/data/github_issue_mapping.json
+++ b/test/data/github_issue_mapping.json
@@ -1,10 +1,10 @@
 {
-    "url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/2",
-    "repository_url": "https://api.github.com/repos/almighty-test/almighty-test-unit",
-    "labels_url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/2/labels{/name}",
-    "comments_url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/2/comments",
-    "events_url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/2/events",
-    "html_url": "https://github.com/almighty-test/almighty-test-unit/issues/2",
+    "url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2",
+    "repository_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit",
+    "labels_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2/labels{/name}",
+    "comments_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2/comments",
+    "events_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2/events",
+    "html_url": "https://github.com/fabric8-wit-test/fabric8-wit-test-unit/issues/2",
     "id": 176621784,
     "number": 2,
     "title": "map flatten : test case : with assignee",
diff --git a/test/data/github_issue_with_assignee.json b/test/data/github_issue_with_assignee.json
index 8d80c1c..64f50f4 100644
--- a/test/data/github_issue_with_assignee.json
+++ b/test/data/github_issue_with_assignee.json
@@ -1,10 +1,10 @@
 {
-    "url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/2",
-    "repository_url": "https://api.github.com/repos/almighty-test/almighty-test-unit",
-    "labels_url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/2/labels{/name}",
-    "comments_url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/2/comments",
-    "events_url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/2/events",
-    "html_url": "https://github.com/almighty-test/almighty-test-unit/issues/2",
+    "url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2",
+    "repository_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit",
+    "labels_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2/labels{/name}",
+    "comments_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2/comments",
+    "events_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2/events",
+    "html_url": "https://github.com/fabric8-wit-test/fabric8-wit-test-unit/issues/2",
     "id": 176621784,
     "number": 2,
     "title": "map flatten : test case : with assignee",
diff --git a/test/data/github_issue_with_assignee_labels.json b/test/data/github_issue_with_assignee_labels.json
index bc023a1..4c74964 100644
--- a/test/data/github_issue_with_assignee_labels.json
+++ b/test/data/github_issue_with_assignee_labels.json
@@ -1,10 +1,10 @@
 {
-  "url": "https://api.github.com/repos/almighty-unit-test/almighty-test/issues/1",
-  "repository_url": "https://api.github.com/repos/almighty-unit-test/almighty-test",
-  "labels_url": "https://api.github.com/repos/almighty-unit-test/almighty-test/issues/1/labels{/name}",
-  "comments_url": "https://api.github.com/repos/almighty-unit-test/almighty-test/issues/1/comments",
-  "events_url": "https://api.github.com/repos/almighty-unit-test/almighty-test/issues/1/events",
-  "html_url": "https://github.com/almighty-unit-test/almighty-test/issues/1",
+  "url": "https://api.github.com/repos/fabric8-wit-unit-test/fabric8-wit-test/issues/1",
+  "repository_url": "https://api.github.com/repos/fabric8-wit-unit-test/fabric8-wit-test",
+  "labels_url": "https://api.github.com/repos/fabric8-wit-unit-test/fabric8-wit-test/issues/1/labels{/name}",
+  "comments_url": "https://api.github.com/repos/fabric8-wit-unit-test/fabric8-wit-test/issues/1/comments",
+  "events_url": "https://api.github.com/repos/fabric8-wit-unit-test/fabric8-wit-test/issues/1/events",
+  "html_url": "https://github.com/fabric8-wit-unit-test/fabric8-wit-test/issues/1",
   "id": 190659499,
   "number": 1,
   "title": "alm-test case",
@@ -30,7 +30,7 @@
   "labels": [
     {
       "id": 485776411,
-      "url": "https://api.github.com/repos/almighty-unit-test/almighty-test/labels/enhancement",
+      "url": "https://api.github.com/repos/fabric8-wit-unit-test/fabric8-wit-test/labels/enhancement",
       "name": "enhancement",
       "color": "84b6eb",
       "default": true
diff --git a/test/data/github_issue_with_labels.json b/test/data/github_issue_with_labels.json
index cc3c076..b504421 100644
--- a/test/data/github_issue_with_labels.json
+++ b/test/data/github_issue_with_labels.json
@@ -1,10 +1,10 @@
 {
-  "url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/3",
-  "repository_url": "https://api.github.com/repos/almighty-test/almighty-test-unit",
-  "labels_url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/3/labels{/name}",
-  "comments_url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/3/comments",
-  "events_url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/3/events",
-  "html_url": "https://github.com/almighty-test/almighty-test-unit/issues/3",
+  "url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/3",
+  "repository_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit",
+  "labels_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/3/labels{/name}",
+  "comments_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/3/comments",
+  "events_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/3/events",
+  "html_url": "https://github.com/fabric8-wit-test/fabric8-wit-test-unit/issues/3",
   "id": 188194489,
   "number": 3,
   "title": "map flatten: test case: with labels",
@@ -30,7 +30,7 @@
   "labels": [
     {
       "id": 441665449,
-      "url": "https://api.github.com/repos/almighty-test/almighty-test-unit/labels/bug",
+      "url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/labels/bug",
       "name": "bug",
       "color": "ee0701",
       "default": true
diff --git a/test/data/github_issue_with_unknownassignee.json b/test/data/github_issue_with_unknownassignee.json
index 884a35d..fdb3218 100644
--- a/test/data/github_issue_with_unknownassignee.json
+++ b/test/data/github_issue_with_unknownassignee.json
@@ -1,10 +1,10 @@
 {
-    "url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/2",
-    "repository_url": "https://api.github.com/repos/almighty-test/almighty-test-unit",
-    "labels_url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/2/labels{/name}",
-    "comments_url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/2/comments",
-    "events_url": "https://api.github.com/repos/almighty-test/almighty-test-unit/issues/2/events",
-    "html_url": "https://github.com/almighty-test/almighty-test-unit/issues/2",
+    "url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2",
+    "repository_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit",
+    "labels_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2/labels{/name}",
+    "comments_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2/comments",
+    "events_url": "https://api.github.com/repos/fabric8-wit-test/fabric8-wit-test-unit/issues/2/events",
+    "html_url": "https://github.com/fabric8-wit-test/fabric8-wit-test-unit/issues/2",
     "id": 176621784,
     "number": 2,
     "title": "map flatten : test case : with assignee",
diff --git a/tool/alm-cli/main.go b/tool/wit-cli/main.go
similarity index 91%
rename from tool/alm-cli/main.go
rename to tool/wit-cli/main.go
index 01a83a8..82d29f0 100644
--- a/tool/alm-cli/main.go
+++ b/tool/wit-cli/main.go
@@ -15,8 +15,8 @@ import (
 func main() {
 	// Create command line parser
 	app := &cobra.Command{
-		Use:   "alm-cli",
-		Short: `CLI client for the alm service`,
+		Use:   "wit-cli",
+		Short: `CLI client for the wit service`,
 	}
 
 	// Create client struct
@@ -25,7 +25,7 @@ func main() {
 
 	// Register global flags
 	app.PersistentFlags().StringVarP(&c.Scheme, "scheme", "s", "", "Set the requests scheme")
-	app.PersistentFlags().StringVarP(&c.Host, "host", "H", "almighty.io", "API hostname")
+	app.PersistentFlags().StringVarP(&c.Host, "host", "H", "openshift.io", "API hostname")
 	app.PersistentFlags().DurationVarP(&httpClient.Timeout, "timeout", "t", time.Duration(20)*time.Second, "Set the request timeout")
 	app.PersistentFlags().BoolVar(&c.Dump, "dump", false, "Dump HTTP request and response.")
 
@@ -40,7 +40,7 @@ func main() {
 
 	// Initialize API client
 	c.SetJWTSigner(jwtSigner)
-	c.UserAgent = "alm-cli/1.0"
+	c.UserAgent = "wit-cli/1.0"
 
 	// Register API commands
 	cli.RegisterCommands(app, c)
diff --git a/wit+pmcd.sh b/wit+pmcd.sh
new file mode 100755
index 0000000..9584943
--- /dev/null
+++ b/wit+pmcd.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+
+set -eu
+
+# Initialize a little unprivileged pcp pmcd metrics collector
+# process within this container; run this in a background subshell.
+# No special signal handling or cleanup required.
+(
+# Setup pmcd to run in unprivileged mode of operation
+. /etc/pcp.conf
+
+# Configure pmcd with a minimal set of DSO agents
+rm -f $PCP_PMCDCONF_PATH; # start empty
+echo "# Name  ID  IPC  IPC Params  File/Cmd" >> $PCP_PMCDCONF_PATH;
+echo "pmcd     2  dso  pmcd_init   $PCP_PMDAS_DIR/pmcd/pmda_pmcd.so"   >> $PCP_PMCDCONF_PATH;
+echo "proc     3  dso  proc_init   $PCP_PMDAS_DIR/proc/pmda_proc.so"   >> $PCP_PMCDCONF_PATH;
+echo "linux   60  dso  linux_init  $PCP_PMDAS_DIR/linux/pmda_linux.so" >> $PCP_PMCDCONF_PATH;
+rm -f $PCP_VAR_DIR/pmns/root_xfs $PCP_VAR_DIR/pmns/root_jbd2 $PCP_VAR_DIR/pmns/root_root $PCP_VAR_DIR/pmns/root
+touch $PCP_VAR_DIR/pmns/.NeedRebuild
+
+# allow unauthenticated access to proc.* metrics (default is false)
+export PROC_ACCESS=1
+export PMCD_ROOT_AGENT=0
+
+# NB: we can't use the rc.pmcd script.  It assumes that it's run as root.
+cd $PCP_VAR_DIR/pmns
+./Rebuild
+
+cd $PCP_LOG_DIR
+
+: "${PCP_HOSTNAME:=`hostname`}"
+# possibly: filter pod name?
+
+# We can log in plaintext to stdout also, even though ALM uses
+# JSON.  pmcd is not chatty and only speaks up during errors.
+exec /usr/libexec/pcp/bin/pmcd -l /dev/no-such-file -f -A -H $PCP_HOSTNAME
+) &
+sleep 5 # give time for pmcd's startup messages, so it doesn't intermix with ALM's
+
+
+exec bin/wit ${1+"$@"}