diff --git a/examples/kernel-riscv64/.gitignore b/examples/arch-riscv64-min/.gitignore
similarity index 100%
rename from examples/kernel-riscv64/.gitignore
rename to examples/arch-riscv64-min/.gitignore
diff --git a/examples/kernel-riscv64/Makefile b/examples/arch-riscv64-min/Makefile
similarity index 100%
rename from examples/kernel-riscv64/Makefile
rename to examples/arch-riscv64-min/Makefile
diff --git a/examples/kernel-riscv64/linker.ld b/examples/arch-riscv64-min/linker.ld
similarity index 100%
rename from examples/kernel-riscv64/linker.ld
rename to examples/arch-riscv64-min/linker.ld
diff --git a/examples/kernel-riscv64/main.c b/examples/arch-riscv64-min/main.c
similarity index 100%
rename from examples/kernel-riscv64/main.c
rename to examples/arch-riscv64-min/main.c
diff --git a/examples/kernel-riscv64/start.S b/examples/arch-riscv64-min/start.S
similarity index 100%
rename from examples/kernel-riscv64/start.S
rename to examples/arch-riscv64-min/start.S
diff --git a/examples/kernel-multiboot2-grub/.gitignore b/examples/bootloader-multiboot2-grub/.gitignore
similarity index 100%
rename from examples/kernel-multiboot2-grub/.gitignore
rename to examples/bootloader-multiboot2-grub/.gitignore
diff --git a/examples/kernel-multiboot2-grub/Makefile b/examples/bootloader-multiboot2-grub/Makefile
similarity index 100%
rename from examples/kernel-multiboot2-grub/Makefile
rename to examples/bootloader-multiboot2-grub/Makefile
diff --git a/examples/kernel-multiboot2-grub/expected.txt b/examples/bootloader-multiboot2-grub/expected.txt
similarity index 100%
rename from examples/kernel-multiboot2-grub/expected.txt
rename to examples/bootloader-multiboot2-grub/expected.txt
diff --git a/examples/kernel-multiboot2-grub/linker.ld b/examples/bootloader-multiboot2-grub/linker.ld
similarity index 100%
rename from examples/kernel-multiboot2-grub/linker.ld
rename to examples/bootloader-multiboot2-grub/linker.ld
diff --git a/examples/kernel-multiboot2-grub/main.c b/examples/bootloader-multiboot2-grub/main.c
similarity index 100%
rename from examples/kernel-multiboot2-grub/main.c
rename to examples/bootloader-multiboot2-grub/main.c
diff --git a/examples/kernel-multiboot2-grub/multiboot2.c b/examples/bootloader-multiboot2-grub/multiboot2.c
similarity index 100%
rename from examples/kernel-multiboot2-grub/multiboot2.c
rename to examples/bootloader-multiboot2-grub/multiboot2.c
diff --git a/examples/kernel-multiboot2-grub/rootfs/boot/grub/grub.cfg b/examples/bootloader-multiboot2-grub/rootfs/boot/grub/grub.cfg
similarity index 100%
rename from examples/kernel-multiboot2-grub/rootfs/boot/grub/grub.cfg
rename to examples/bootloader-multiboot2-grub/rootfs/boot/grub/grub.cfg
diff --git a/examples/kernel-multiboot2-grub/start.S b/examples/bootloader-multiboot2-grub/start.S
similarity index 100%
rename from examples/kernel-multiboot2-grub/start.S
rename to examples/bootloader-multiboot2-grub/start.S
diff --git a/examples/kernel-multiboot2-limine/.gitignore b/examples/bootloader-multiboot2-limine/.gitignore
similarity index 100%
rename from examples/kernel-multiboot2-limine/.gitignore
rename to examples/bootloader-multiboot2-limine/.gitignore
diff --git a/examples/kernel-multiboot2-limine/Makefile b/examples/bootloader-multiboot2-limine/Makefile
similarity index 100%
rename from examples/kernel-multiboot2-limine/Makefile
rename to examples/bootloader-multiboot2-limine/Makefile
diff --git a/examples/kernel-multiboot2-limine/expected.txt b/examples/bootloader-multiboot2-limine/expected.txt
similarity index 100%
rename from examples/kernel-multiboot2-limine/expected.txt
rename to examples/bootloader-multiboot2-limine/expected.txt
diff --git a/examples/kernel-multiboot2-limine/linker.ld b/examples/bootloader-multiboot2-limine/linker.ld
similarity index 100%
rename from examples/kernel-multiboot2-limine/linker.ld
rename to examples/bootloader-multiboot2-limine/linker.ld
diff --git a/examples/kernel-multiboot2-limine/main.c b/examples/bootloader-multiboot2-limine/main.c
similarity index 100%
rename from examples/kernel-multiboot2-limine/main.c
rename to examples/bootloader-multiboot2-limine/main.c
diff --git a/examples/kernel-multiboot2-limine/multiboot2.c b/examples/bootloader-multiboot2-limine/multiboot2.c
similarity index 100%
rename from examples/kernel-multiboot2-limine/multiboot2.c
rename to examples/bootloader-multiboot2-limine/multiboot2.c
diff --git a/examples/kernel-multiboot2-limine/rootfs/boot/limine.cfg b/examples/bootloader-multiboot2-limine/rootfs/boot/limine.cfg
similarity index 100%
rename from examples/kernel-multiboot2-limine/rootfs/boot/limine.cfg
rename to examples/bootloader-multiboot2-limine/rootfs/boot/limine.cfg
diff --git a/examples/kernel-multiboot2-limine/start.S b/examples/bootloader-multiboot2-limine/start.S
similarity index 100%
rename from examples/kernel-multiboot2-limine/start.S
rename to examples/bootloader-multiboot2-limine/start.S
diff --git a/examples/kernel-stivale2-limine/.gitignore b/examples/bootloader-stivale2-limine/.gitignore
similarity index 100%
rename from examples/kernel-stivale2-limine/.gitignore
rename to examples/bootloader-stivale2-limine/.gitignore
diff --git a/examples/kernel-stivale2-limine/Makefile b/examples/bootloader-stivale2-limine/Makefile
similarity index 100%
rename from examples/kernel-stivale2-limine/Makefile
rename to examples/bootloader-stivale2-limine/Makefile
diff --git a/examples/kernel-stivale2-limine/expected.txt b/examples/bootloader-stivale2-limine/expected.txt
similarity index 100%
rename from examples/kernel-stivale2-limine/expected.txt
rename to examples/bootloader-stivale2-limine/expected.txt
diff --git a/examples/kernel-stivale2-limine/linker.ld b/examples/bootloader-stivale2-limine/linker.ld
similarity index 100%
rename from examples/kernel-stivale2-limine/linker.ld
rename to examples/bootloader-stivale2-limine/linker.ld
diff --git a/examples/kernel-stivale2-limine/main.c b/examples/bootloader-stivale2-limine/main.c
similarity index 100%
rename from examples/kernel-stivale2-limine/main.c
rename to examples/bootloader-stivale2-limine/main.c
diff --git a/examples/kernel-stivale2-limine/rootfs/boot/limine.cfg b/examples/bootloader-stivale2-limine/rootfs/boot/limine.cfg
similarity index 100%
rename from examples/kernel-stivale2-limine/rootfs/boot/limine.cfg
rename to examples/bootloader-stivale2-limine/rootfs/boot/limine.cfg
diff --git a/examples/kernel-stivale2-limine/stivale2.h b/examples/bootloader-stivale2-limine/stivale2.h
similarity index 100%
rename from examples/kernel-stivale2-limine/stivale2.h
rename to examples/bootloader-stivale2-limine/stivale2.h