diff --git a/cmd/bash/main.go b/cmd/bash/main.go
index 24f250f366e..9887f306089 100644
--- a/cmd/bash/main.go
+++ b/cmd/bash/main.go
@@ -19,13 +19,13 @@ This tool is for executing `shell` command. To override base shell image update
 
 To use it, run
 ```
-image: github.com/build-pipeline/cmd/bash
+image: github.com/tektoncd/pipeline/cmd/bash
 args: ['-args', 'ARGUMENTS_FOR_SHELL_COMMAND']
 ```
 
 For help, run `man sub-command`
 ```
-image: github.com/build-pipeline/cmd/bash
+image: github.com/tektoncd/pipeline/cmd/bash
 args: ['-args', `man`,`mkdir`]
 ```
 
@@ -33,7 +33,7 @@ For example:
 Following example executes shell sub-command `mkdir`
 
 ```
-image: github.com/build-pipeline/cmd/bash
+image: github.com/tektoncd/pipeline/cmd/bash
 args:  ['-args', 'mkdir', '-p', '/workspace/gcs-dir']
 ```
 */
diff --git a/cmd/gsutil/main.go b/cmd/gsutil/main.go
index f106ff76a1d..913f47f159d 100644
--- a/cmd/gsutil/main.go
+++ b/cmd/gsutil/main.go
@@ -22,14 +22,14 @@ To override gsutil base image update `.ko.yaml` file.
 
 To use it, run
 ```
-image: github.com/build-pipeline/cmd/gsutil
+image: github.com/tektoncd/pipeline/cmd/gsutil
 args: ['-args', 'ARGUMENTS_FOR_GSUTIL_COMMAND']
 
 ```
 
 For help, run
 ```
-image: github.com/build-pipeline/cmd/gsutil
+image: github.com/tektoncd/pipeline/cmd/gsutil
 args: ['-args','--help']
 ```
 
@@ -37,7 +37,7 @@ For example:
 Following example executes gsutil sub-command `cp`
 
 ```
-image: github.com/build-pipeline/cmd/gsutil
+image: github.com/tektoncd/pipeline/cmd/gsutil
 args: ['-args', 'cp', 'gs://fake-bucket/rules.zip', '/workspace/gcs-dir'
 env:
   - name: GOOGLE_APPLICATION_CREDENTIALS
diff --git a/config/300-clustertask.yaml b/config/300-clustertask.yaml
index 420fb15bb2d..1ba0c83a51d 100644
--- a/config/300-clustertask.yaml
+++ b/config/300-clustertask.yaml
@@ -22,7 +22,6 @@ spec:
     plural: clustertasks
     categories:
     - all
-    - knative
     - tekton-pipelines
   scope: Cluster
   # Opt into the status subresource so metadata.generation
diff --git a/config/300-pipeline.yaml b/config/300-pipeline.yaml
index dcbe9f8a43c..7c34796f3ef 100644
--- a/config/300-pipeline.yaml
+++ b/config/300-pipeline.yaml
@@ -22,7 +22,6 @@ spec:
     plural: pipelines
     categories:
     - all
-    - knative
     - tekton-pipelines
   scope: Namespaced
   # Opt into the status subresource so metadata.generation
diff --git a/config/300-pipelinerun.yaml b/config/300-pipelinerun.yaml
index c3671038bf5..4b416fe10f1 100644
--- a/config/300-pipelinerun.yaml
+++ b/config/300-pipelinerun.yaml
@@ -22,7 +22,6 @@ spec:
     plural: pipelineruns
     categories:
     - all
-    - knative
     - tekton-pipelines
   scope: Namespaced
   additionalPrinterColumns:
diff --git a/config/300-resource.yaml b/config/300-resource.yaml
index 3c022f84bb2..ee9c1fa0ff8 100644
--- a/config/300-resource.yaml
+++ b/config/300-resource.yaml
@@ -22,7 +22,6 @@ spec:
     plural: pipelineresources
     categories:
     - all
-    - knative
     - tekton-pipelines
   scope: Namespaced
   # Opt into the status subresource so metadata.generation
diff --git a/config/300-task.yaml b/config/300-task.yaml
index 00502b4ab76..3255a3ba217 100644
--- a/config/300-task.yaml
+++ b/config/300-task.yaml
@@ -22,7 +22,6 @@ spec:
     plural: tasks
     categories:
     - all
-    - knative
     - tekton-pipelines
   scope: Namespaced
   # Opt into the status subresource so metadata.generation
diff --git a/config/300-taskrun.yaml b/config/300-taskrun.yaml
index f7f628767a1..73eaf50d6b4 100644
--- a/config/300-taskrun.yaml
+++ b/config/300-taskrun.yaml
@@ -22,7 +22,6 @@ spec:
     plural: taskruns
     categories:
     - all
-    - knative
     - tekton-pipelines
   scope: Namespaced
   additionalPrinterColumns:
diff --git a/docs/container-contract.md b/docs/container-contract.md
index 03babf0705d..f026164f802 100644
--- a/docs/container-contract.md
+++ b/docs/container-contract.md
@@ -14,7 +14,7 @@ When `command` is not explicitly set, the controller will attempt to lookup the
 entrypoint from the remote registry. If the image is a private registry, the
 service account should include an
 [ImagePullSecret](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#add-imagepullsecrets-to-a-service-account).
-The build-pipeline controller will use the `ImagePullSecret` of the service
+The Tekton controller will use the `ImagePullSecret` of the service
 account, and if service account is empty, `default` is assumed. Next is falling
 back to docker config added in a `.docker/config.json` at
 `$HOME/.docker/config.json`. If none of these credentials are available the
diff --git a/docs/tutorial.md b/docs/tutorial.md
index 1f1578c31b9..9e3e22a169f 100644
--- a/docs/tutorial.md
+++ b/docs/tutorial.md
@@ -236,7 +236,7 @@ To see all the resource created so far as part of Tekton Pipelines, run the
 command:
 
 ```bash
-kubectl get build-pipeline
+kubectl get tekton-pipelines
 ```
 
 You will get an output similar to the following:
diff --git a/hack/release.sh b/hack/release.sh
index 0af1e2f41c2..2047444bfee 100755
--- a/hack/release.sh
+++ b/hack/release.sh
@@ -31,7 +31,7 @@ function build_release() {
   fi
   # Build the base image for creds-init and git images.
   docker build -t "${KO_DOCKER_REPO}/github.com/tektoncd/pipeline/build-base" -f images/Dockerfile images/
-  echo "Building build-pipeline"
+  echo "Building Tekton Pipeline"
   ko resolve ${KO_FLAGS} -f config/ > ${OUTPUT_YAML}
   YAMLS_TO_PUBLISH="${OUTPUT_YAML}"
 }
diff --git a/pkg/reconciler/v1alpha1/taskrun/taskrun_test.go b/pkg/reconciler/v1alpha1/taskrun/taskrun_test.go
index 320e774a908..d7e6c853d26 100644
--- a/pkg/reconciler/v1alpha1/taskrun/taskrun_test.go
+++ b/pkg/reconciler/v1alpha1/taskrun/taskrun_test.go
@@ -246,7 +246,7 @@ func TestReconcile(t *testing.T) {
 				Type: v1alpha1.PipelineResourceTypeGit,
 				Params: []v1alpha1.Param{{
 					Name:  "URL",
-					Value: "github.com/build-pipeline.git",
+					Value: "github.com/foo/bar.git",
 				}, {
 					Name:  "revision",
 					Value: "rel-can",
@@ -572,7 +572,7 @@ func TestReconcile(t *testing.T) {
 				tb.PodContainer("build-step-git-source-workspace-9l9zj", "override-with-git:latest",
 					tb.Command(entrypointLocation),
 					tb.Args("-wait_file", "", "-post_file", "/builder/tools/0", "-entrypoint", "/ko-app/git-init", "--",
-						"-url", "github.com/build-pipeline.git", "-revision", "rel-can", "-path",
+						"-url", "github.com/foo/bar.git", "-revision", "rel-can", "-path",
 						"/workspace/workspace"),
 					tb.WorkingDir(workspaceDir),
 					tb.EnvVar("HOME", "/builder/home"),
diff --git a/pkg/system/names.go b/pkg/system/names.go
index 23e01c6b4de..e4c2fec684e 100644
--- a/pkg/system/names.go
+++ b/pkg/system/names.go
@@ -23,8 +23,7 @@ const (
 	SystemNamespaceEnvVar = "SYSTEM_NAMESPACE"
 )
 
-// GetNamespace holds the K8s namespace where our build-pipeline system
-// components run.
+// GetNamespace holds the K8s namespace where our system components run.
 func GetNamespace() string {
 	systemNamespace := os.Getenv(SystemNamespaceEnvVar)
 	if systemNamespace == "" {
diff --git a/tekton/README.md b/tekton/README.md
index a71eed5029a..6ed1459a8d4 100644
--- a/tekton/README.md
+++ b/tekton/README.md
@@ -4,13 +4,13 @@ We dogfood our project by using Tekton Pipelines to build, test and release
 Tekton Pipelines!
 
 This directory contains the
-[`Tasks`](https://github.com/knative/build-pipeline/blob/master/docs/tasks.md)
+[`Tasks`](https://github.com/tektoncd/pipeline/blob/master/docs/tasks.md)
 and
-[`Pipelines`](https://github.com/knative/build-pipeline/blob/master/docs/pipelines.md)
+[`Pipelines`](https://github.com/tektoncd/pipeline/blob/master/docs/pipelines.md)
 that we (will) use.
 
 TODO(#538): In #538 or #537 we will update
-[Prow](https://github.com/knative/build-pipeline/blob/master/CONTRIBUTING.md#pull-request-process)
+[Prow](https://github.com/tektoncd/pipeline/blob/master/CONTRIBUTING.md#pull-request-process)
 to invoke these `Pipelines` automatically, but for now we will have to invoke
 them manually.
 
@@ -32,15 +32,15 @@ The `Tasks` which make up our release `Pipeline` are:
 
 To run these `Pipelines` and `Tasks`, you must have Tekton Pipelines installed
 (in your own kubernetes cluster) either via
-[an official release](https://github.com/knative/build-pipeline/blob/master/docs/install.md)
+[an official release](https://github.com/tektoncd/pipeline/blob/master/docs/install.md)
 or
-[from `HEAD`](https://github.com/knative/build-pipeline/blob/master/DEVELOPMENT.md#install-pipeline).
+[from `HEAD`](https://github.com/tektoncd/pipeline/blob/master/DEVELOPMENT.md#install-pipeline).
 
 TODO(#531): Add the Pipeline, for now all we have are `Tasks` which we can
 invoke individually by creating
-[`TaskRuns`](https://github.com/knative/build-pipeline/blob/master/docs/taskruns.md)
+[`TaskRuns`](https://github.com/tektoncd/pipeline/blob/master/docs/taskruns.md)
 and
-[`PipelineResources`](https://github.com/knative/build-pipeline/blob/master/docs/resources.md).
+[`PipelineResources`](https://github.com/tektoncd/pipeline/blob/master/docs/resources.md).
 
 TODO(#569): Normally we'd use the image `PipelineResources` to control which
 image registry the images are pushed to. However since we have so many images,
diff --git a/test/README.md b/test/README.md
index 8f6ee543471..622e1af615b 100644
--- a/test/README.md
+++ b/test/README.md
@@ -227,12 +227,14 @@ be used to run only [the unit tests](#unit-tests), i.e.:
 // +build e2e
 ```
 
-#### Create build-pipeline objects
+#### Create Tekton objects
 
-To create `build-pipeline` objects (e.g. `Task`, `Pipeline`, …), you can use the
-[`builder`](./builder) package to reduce noise:
+To create Tekton objects (e.g. `Task`, `Pipeline`, …), you can use the
+[`github.com/tektoncd/pipeline/test/builder`](./builder) package to reduce noise:
 
 ```go
+import tb "github.com/tektoncd/pipeline/test/builder"
+
 func MyTest(t *testing.T){
     // Pipeline
     pipeline := tb.Pipeline("tomatoes", "namespace",
diff --git a/test/adoc.go b/test/adoc.go
index d1d46ffdb4a..02148db8e1d 100644
--- a/test/adoc.go
+++ b/test/adoc.go
@@ -16,7 +16,7 @@ Package test holds the project's test helpers and end-to-end tests (e2e).
 
 Create Pipeline resources
 
-To create build-pipeline objects (e.g. Task, Pipeline, …), you
+To create Tekton objects (e.g. Task, Pipeline, …), you
 can use the builder (./builder) package to reduce noise:
 
 	func MyTest(t *testing.T){