diff --git a/hikey960.mk b/hikey960.mk
index f187bb1d442d8f015ee3aad8406d3253c7d7d3f0..3df5e0510f01398f2d093591355f58195f43537b 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -61,7 +61,9 @@ STRACE_PATH			?=$(ROOT)/strace
 all: arm-tf boot-img lloader strace
 
 .PHONY: clean
-clean: arm-tf-clean busybox-clean edk2-clean linux-clean optee-os-clean optee-client-clean xtest-clean helloworld-clean strace-clean update_rootfs-clean boot-img-clean lloader-clean grub-clean
+clean: arm-tf-clean busybox-clean edk2-clean linux-clean optee-os-clean \
+		optee-client-clean xtest-clean optee-examples-clean strace-clean \
+		update_rootfs-clean boot-img-clean lloader-clean grub-clean
 
 .PHONY: cleaner
 cleaner: clean prepare-cleaner busybox-cleaner linux-cleaner strace-cleaner grub-cleaner
@@ -228,13 +230,13 @@ xtest-clean: xtest-clean-common
 xtest-patch: xtest-patch-common
 
 ################################################################################
-# hello_world
+# Sample applications / optee_examples
 ################################################################################
-.PHONY: helloworld
-helloworld: helloworld-common
+.PHONY: optee-examples
+optee-examples: optee-examples-common
 
-.PHONY: helloworld-clean
-helloworld-clean: helloworld-clean-common
+.PHONY: optee-examples-clean
+optee-examples-clean: optee-examples-clean-common
 
 ################################################################################
 # strace
diff --git a/rpi3.mk b/rpi3.mk
index 14b2576845d25f9271332a4c2e5aa45e3f4030d9..35795567fa82a1f4150abe283f465266b55f41cd 100644
--- a/rpi3.mk
+++ b/rpi3.mk
@@ -61,9 +61,9 @@ ifeq ($(CFG_TEE_BENCHMARK),y)
 all: benchmark-app
 clean: benchmark-app-clean
 endif
-all: rpi3-firmware arm-tf optee-os optee-client xtest u-boot u-boot-jtag-bin\
+all: rpi3-firmware arm-tf optee-os optee-client xtest u-boot u-boot-rpi-bin\
 	linux update_rootfs optee-examples
-clean: arm-tf-clean busybox-clean u-boot-clean u-boot-jtag-bin-clean \
+clean: arm-tf-clean busybox-clean u-boot-clean u-boot-rpi-bin-clean \
 	optee-os-clean optee-client-clean rpi3-firmware-clean head-bin-clean \
 	optee-examples-clean