diff --git a/Makefile b/Makefile
index 82d23836..a422a74d 100644
--- a/Makefile
+++ b/Makefile
@@ -271,10 +271,10 @@ QEMU_PARAMS += $(QEMU_PARAMS_NOGFX)
 
 QEMU_PARAMS_DEBUG := -s -S &
 
-ISO_FILE := boot.iso
+ISO_FILE := ktf.iso
 
 ifneq ($(SYSTEM), LINUX)
-$(ISO_FILE): dockerboot.iso
+$(ISO_FILE): docker${ISO_FILE}
 else
 $(ISO_FILE): $(TARGET)
 	@echo "GEN ISO" $(ISO_FILE)
diff --git a/README.md b/README.md
index 9958c42e..5d520b12 100644
--- a/README.md
+++ b/README.md
@@ -28,11 +28,11 @@ Some more features are in the making. Check out the issues.
 The quick start is to run the following commands. The content of the file tests/test.c
 will be executed. Note, the last command will block.
 
-Build a boot.iso from scratch, in the docker container.
+Build a ktf.iso from scratch, in the docker container.
 
 ```
 make clean
-make docker:boot.iso
+make docker:ktf.iso
 ```
 
 Boot the resulting image:
@@ -66,17 +66,17 @@ make docker:all
 
 * Native
 ```
-make boot.iso
+make ktf.iso
 ```
 
 * Docker
 
 ```
-make docker:boot.iso
+make docker:ktf.iso
 ```
 
 The `make` command generates the `kernel64.bin` multiboot-compatible ELF file, that you can directly boot with QEMU.
-The `make boot.iso` command takes the `kernel64.bin`, places it in `grub/boot/` directory hierarchy and generates a `boot.iso`
+The `make ktf.iso` command takes the `kernel64.bin`, places it in `grub/boot/` directory hierarchy and generates a `ktf.iso`
 out of the `grub/` (using `grub/boot/grub/grub.cfg` as a default GRUB config).
 
 #### Fedora
@@ -127,7 +127,7 @@ memory=1024
 
 serial= [ 'file:/tmp/kernel.log', 'pty' ]
 
-disk = [ '/home/user/boot.iso,,hdc,cdrom' ]
+disk = [ '/home/user/ktf.iso,,hdc,cdrom' ]
 
 on_reboot = "destroy"
 
@@ -223,4 +223,3 @@ and we're actively sharing ideas, bugs and anything related to KTF there. Feel f
 ![GitHub](https://img.shields.io/github/license/awslabs/ktf)
 
 This project is licensed under the BSD 2-Clause License.
-
diff --git a/tools/ci/build-docker.sh b/tools/ci/build-docker.sh
index c73ebb83..2826af97 100755
--- a/tools/ci/build-docker.sh
+++ b/tools/ci/build-docker.sh
@@ -2,7 +2,7 @@
 #
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
-# This script builds the project's boot.iso file in the docker environment
+# This script builds the project's ktf.iso file in the docker environment
 set -e
 
 COMPILER=$1
@@ -16,4 +16,4 @@ cd "$SCRIPTDIR"/../..
 
 # Build project in docker
 make clean V=1
-make docker:boot.iso V=1 CC=$COMPILER
+make docker:ktf.iso V=1 CC=$COMPILER
diff --git a/tools/ci/launch-test.sh b/tools/ci/launch-test.sh
index 55993cf3..7d84caab 100755
--- a/tools/ci/launch-test.sh
+++ b/tools/ci/launch-test.sh
@@ -2,7 +2,7 @@
 #
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
-# This script builds the project's boot.iso file in the docker environment and
+# This script builds the project's ktf.iso file in the docker environment and
 # next launches a test and checks for a successful timeout.
 set -e
 
@@ -18,7 +18,7 @@ cd "$SCRIPTDIR"/../..
 # Build project in docker
 echo "Building project from scratch"
 make clean V=1
-make UNITTEST=1 docker:boot.iso V=1 CC=$COMPILER
+make UNITTEST=1 docker:ktf.iso V=1 CC=$COMPILER
 
 # Use QEMU to launch the guest
 echo "Launching KTF"
diff --git a/tools/xen_config/config b/tools/xen_config/config
index ca692781..0bda93d5 100644
--- a/tools/xen_config/config
+++ b/tools/xen_config/config
@@ -4,7 +4,7 @@ memory=1024
 
 serial= [ 'file:/tmp/kernel.log', 'pty' ]
 
-disk = [ '/home/user/boot.iso,,hdc,cdrom' ]
+disk = [ '/home/user/ktf.iso,,hdc,cdrom' ]
 
 on_reboot = "destroy"