diff --git a/linux-kernel/Makefile b/linux-kernel/Makefile
index 846854d..167558c 100644
--- a/linux-kernel/Makefile
+++ b/linux-kernel/Makefile
@@ -22,14 +22,14 @@ build: $(KERNEL_TREE) $(KERNEL_CONFIG)
 
 fuzz: $(KERNEL_IMAGE)
 	KAFL_CONFIG_FILE=kafl_config.yaml \
-	kafl fuzz --purge -p 4 \
+	kafl_fuzz.py --work-dir $$KAFL_WORKDIR --purge -p 4 \
 		--kernel $(KERNEL_IMAGE) \
 		--memory 1024 \
 		-t 0.1 -ts 0.01 \
 		--log --log-crashes
 
 plot:
-	kafl plot
+	kafl_plot.py $$KAFL_WORKDIR
 
 test:
 	# basic smoke test. build, run, and check that we found some crashes
diff --git a/linux-kernel/README.md b/linux-kernel/README.md
index c8bce46..8632a9f 100644
--- a/linux-kernel/README.md
+++ b/linux-kernel/README.md
@@ -49,7 +49,7 @@ launching the fuzzer is as simple as booting the kernel:
 
 ```
 export KAFL_CONFIG_FILE=kafl_config.yaml
-kafl fuzz  --purge -w /dev/shm/kafl \
+kafl_fuzz.py  --purge -w /dev/shm/kafl \
 	--redqueen --grimoire -D --radamsa
 	--kernel linux-guest/arch/x86/boot/bzImage
 	-t 0.1 -ts 0.01 -m 512 --log-crashes -p 2
@@ -144,7 +144,7 @@ during kernel boot and logged using `kafl_hprintf()`. Launching the fuzzer with
 log in `$KAFL_WORKDIR/hprintf_00.log`.  Once you found the IP ranges, you can
 launch the `kafl cov` tool with same VM guest config and PT filter ranges:
 
-KAFL_CONFIG_FILE=kafl_config.yaml kafl cov \
+KAFL_CONFIG_FILE=kafl_config.yaml kafl_cov.py \
 	--resume --work-dir $KAFL_WORKDIR \
 	--input $KAFL_WORKDIR \
 	--kernel source/arch/x86/boot/bzImage \
@@ -170,7 +170,7 @@ dump PT trace info to `$workdir/traces/*bin.lz4`. The tool will also call
 big corpuses, you can parallelize this process using `-p`. Example:
 
 ```
-KAFL_CONFIG_FILE=kafl_config.yaml kafl cov \
+KAFL_CONFIG_FILE=kafl_config.yaml kafl_cov.py \
 	--input $KAFL_WORKDIR \
 	--kernel source/arch/x86/boot/bzImage \
 	-ip0 ffffffff81000000-ffffffff83603000 \
diff --git a/linux-user/forkserver/Makefile b/linux-user/forkserver/Makefile
index 20aad39..aa4253f 100644
--- a/linux-user/forkserver/Makefile
+++ b/linux-user/forkserver/Makefile
@@ -34,7 +34,8 @@ $(TARGET).cpio.gz: $(TARGET).so ../vmcall/vmcall /usr/bin/bison
 
 test: $(TARGET).cpio.gz $(TARGET).so
 	# default kAFL config enables Linux serial console, see $$KAFL_WORKDIR/serial_00.log
-	kafl fuzz \
+	kafl_fuzz.py \
+		--work-dir $$KAFL_WORKDIR \
 		--kernel $(KERNEL_IMAGE) \
 		--initrd $< \
 		--memory 512 \
diff --git a/linux-user/fs_fuzzer/Makefile b/linux-user/fs_fuzzer/Makefile
index f306718..693661b 100644
--- a/linux-user/fs_fuzzer/Makefile
+++ b/linux-user/fs_fuzzer/Makefile
@@ -34,7 +34,8 @@ $(TARGET).cpio.gz: $(TARGET) ../vmcall/vmcall
 
 test: $(TARGET).cpio.gz $(TARGET) seeds
 	@# default kAFL config enables Linux serial console, see $$KAFL_WORKDIR/serial_00.log
-	kafl fuzz \
+	kafl_fuzz.py \
+		--work-dir $$KAFL_WORKDIR \
 		--kernel $(KERNEL_IMAGE) \
 		--initrd $< \
 		--memory 512 \
diff --git a/linux-user/vmcall/Makefile b/linux-user/vmcall/Makefile
index 2307b0f..3d4b3de 100644
--- a/linux-user/vmcall/Makefile
+++ b/linux-user/vmcall/Makefile
@@ -31,7 +31,8 @@ $(TARGET).cpio.gz: $(TARGET)
 
 run: $(TARGET).cpio.gz
 	@# default kAFL config enables Linux serial console, see $$KAFL_WORKDIR/serial_00.log
-	kafl fuzz \
+	kafl_fuzz.py \
+		--work-dir $$KAFL_WORKDIR \
 		--kernel $(KERNEL_IMAGE) \
 		--initrd $< \
 		--memory 512 \