diff --git a/Makefile b/Makefile
index d0f6d65f0..e87122f90 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ install:
 	cp -R ./bin/* $(PREFIX)/bin
 
 define check_test_log
-	@cat $1 |grep -q 'Moby test suite PASSED'
+	@cat $1 |grep -q 'Kernel config test suite PASSED'
 endef
 
 .PHONY: test-hyperkit
diff --git a/test/check/Makefile b/test/check/Makefile
index 8a95e3452..de24bfc86 100644
--- a/test/check/Makefile
+++ b/test/check/Makefile
@@ -5,21 +5,21 @@ IMAGE=check
 
 default: push
 
-hash: Dockerfile check.sh check-kernel-config.sh etc/moby
+hash: Dockerfile check.sh check-kernel-config.sh etc/linuxkit
 	DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
 	tar cf - $^ | docker build --no-cache -t $(IMAGE):build -
 	docker run --rm --entrypoint=/bin/sh $(IMAGE):build -c "cat $^ /lib/apk/db/installed | sha1sum" | sed 's/ .*//' > hash
 
 push: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
-		 docker push mobylinux/$(IMAGE):$(shell cat hash))
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
+		 docker push linuxkit/$(IMAGE):$(shell cat hash))
 	docker rmi $(IMAGE):build
 	rm -f hash
 
 tag: hash
-	docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
+	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
+		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
 	docker rmi $(IMAGE):build
 	rm -f hash
 
diff --git a/test/check/check-kernel-config.sh b/test/check/check-kernel-config.sh
index d0fe52248..28dec1563 100755
--- a/test/check/check-kernel-config.sh
+++ b/test/check/check-kernel-config.sh
@@ -4,7 +4,7 @@ set -e
 
 echo "starting kernel config sanity test with /proc/config.gz"
 
-# decompress /proc/config.gz from the Moby host
+# decompress /proc/config.gz from the host
 UNZIPPED_CONFIG=$(zcat /proc/config.gz)
 
 kernelVersion="$(uname -r)"
diff --git a/test/check/check.sh b/test/check/check.sh
index 832cec8fa..b28311d9b 100755
--- a/test/check/check.sh
+++ b/test/check/check.sh
@@ -1,15 +1,15 @@
 #!/bin/sh
 
 function failed {
-	printf "Moby test suite FAILED\n"
+	printf "Kernel config test suite FAILED\n"
 	/sbin/poweroff -f
 }
 
 /check-kernel-config.sh || failed
 bash /check-config.sh || failed
 
-printf "Moby test suite PASSED\n"
+printf "Kernel config test suite PASSED\n"
 
-cat /etc/moby
+cat /etc/linuxkit
 
 /sbin/poweroff -f
diff --git a/test/check/etc/moby b/test/check/etc/linuxkit
similarity index 99%
rename from test/check/etc/moby
rename to test/check/etc/linuxkit
index bcb34ed49..17d4dfb92 100644
--- a/test/check/etc/moby
+++ b/test/check/etc/linuxkit
@@ -7,4 +7,3 @@
            \______ o           __/
              \    \         __/
               \____\_______/
-
diff --git a/test/test.yml b/test/test.yml
index 4cd21c41e..dcfa7f755 100644
--- a/test/test.yml
+++ b/test/test.yml
@@ -1,11 +1,11 @@
 kernel:
-  image: "mobylinux/kernel:4.9.x"
+  image: "linuxkit/kernel:4.9.x"
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
-  - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
-  - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
-  - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
+  - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
+  - linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
+  - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
 onboot:
   - name: dhcpcd
     image: "linuxkit/dhcpcd:48e249ebef6a521eed886b3bce032db69fbb4afa"
@@ -19,7 +19,7 @@ onboot:
     net: host
     command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
   - name: check
-    image: "mobylinux/check:c9e41ab96b3ea6a3ced97634751e20d12a5bf52f"
+    image: "linuxkit/check:43c4147dda4e02d066ef158cd81718dbff8c8bd0"
     pid: host
     capabilities:
      - CAP_SYS_BOOT