diff --git a/README.md b/README.md
index 124625a..e1774f6 100644
--- a/README.md
+++ b/README.md
@@ -19,13 +19,15 @@ For example, `docker pull ko.kontain.me/ko/github.com/google/ko/cmd/ko` will
 fetch, build and (eventually) serve a Docker image containing `ko` itself.
 _Koception!_
 
-# `cnb.kontain.me`
+# `buildpack.kontain.me`
 
-`docker pull cnb.kontain.me/[ghuser]/[ghrepo]:[revision]` serves
-an image fetched from source on GitHub and built using [CNCF Buildpacks](https://buildpacks.io)
+`docker pull buildpack.kontain.me/[ghuser]/[ghrepo]:[revision]` serves an image
+fetched from source on GitHub and built using [CNCF
+Buildpacks](https://buildpacks.io)
 
-For example, `docker pull cnb.kontain.me/buildpack/sample-java-app:b032838` fetches, builds
-and serves a [sample Java app](https://github.com/buildpack/sample-java-app).
+For example, `docker pull
+buildpack.kontain.me/buildpack/sample-java-app:b032838` fetches, builds and
+serves a [sample Java app](https://github.com/buildpack/sample-java-app).
 
 # Caveats
 
diff --git a/cmd/app/kodata/index.html b/cmd/app/kodata/index.html
index 08fa7b7..815ecc0 100644
--- a/cmd/app/kodata/index.html
+++ b/cmd/app/kodata/index.html
@@ -32,15 +32,16 @@ container image using <a
 build and (eventually) serve a Docker image containing <code>ko</code> itself.
 <i>Koception!</i></p>
 
-<h1><code>cnb.kontain.me</code></h1>
+<h1><code>buildpack.kontain.me</code></h1>
 
-<p><code>docker pull cnb.kontain.me/[ghuser]/[ghrepo]:[revision]</code> serves
-an image fetched from source on GitHub and built using <a
-href="https://buildpacks.io">CNCF Buildpacks</a>.</p>
+<p><code>docker pull buildpack.kontain.me/[ghuser]/[ghrepo]:[revision]</code>
+serves an image fetched from source on GitHub and built using <a
+ href="https://buildpacks.io">CNCF Buildpacks</a>.</p>
 
 <p>For example, <code>docker pull
-	cnb.kontain.me/buildpack/sample-java-app:b032838</code> fetches, builds
-and serves a <a href="https://github.com/buildpack/sample-java-app">sample Java
+	buildpack.kontain.me/buildpack/sample-java-app:b032838</code> fetches,
+builds and serves a <a
+	href="https://github.com/buildpack/sample-java-app">sample Java
 	app</a>.</p>
 
 <h1>Caveats</h1>
diff --git a/test.sh b/test.sh
index dd7ff5e..5f2e2e9 100755
--- a/test.sh
+++ b/test.sh
@@ -9,4 +9,5 @@ time docker pull random.kontain.me/random:8x80
 
 time docker pull ko.kontain.me/ko/github.com/knative/build/cmd/controller
 
-time docker pull cnb.kontain.me/buildpack/sample-java-app
+time docker pull buildpack.kontain.me/buildpack/sample-java-app
+time docker pull buildpack.kontain.me/buildpack/sample-java-app # caching! # caching! # caching!