diff --git a/recipes-devtool/gdb/gdb-cross-canadian_riscv.bb b/recipes-devtools/gdb/gdb-cross-canadian_riscv.bb
similarity index 100%
rename from recipes-devtool/gdb/gdb-cross-canadian_riscv.bb
rename to recipes-devtools/gdb/gdb-cross-canadian_riscv.bb
diff --git a/recipes-devtool/gdb/gdb-cross_riscv.bb b/recipes-devtools/gdb/gdb-cross_riscv.bb
similarity index 100%
rename from recipes-devtool/gdb/gdb-cross_riscv.bb
rename to recipes-devtools/gdb/gdb-cross_riscv.bb
diff --git a/recipes-devtool/gdb/gdb-riscv.inc b/recipes-devtools/gdb/gdb-riscv.inc
similarity index 100%
rename from recipes-devtool/gdb/gdb-riscv.inc
rename to recipes-devtools/gdb/gdb-riscv.inc
diff --git a/recipes-devtool/gdb/gdb_riscv.bb b/recipes-devtools/gdb/gdb_riscv.bb
similarity index 100%
rename from recipes-devtool/gdb/gdb_riscv.bb
rename to recipes-devtools/gdb/gdb_riscv.bb
diff --git a/recipes-devtool/prelink/files/0001-prelink-Add-RISC-V-support.patch b/recipes-devtools/prelink/files/0001-prelink-Add-RISC-V-support.patch
similarity index 100%
rename from recipes-devtool/prelink/files/0001-prelink-Add-RISC-V-support.patch
rename to recipes-devtools/prelink/files/0001-prelink-Add-RISC-V-support.patch
diff --git a/recipes-devtool/prelink/files/0001-rtld-Add-missing-DT_NEEDED-DSOs-to-needed_list.patch b/recipes-devtools/prelink/files/0001-rtld-Add-missing-DT_NEEDED-DSOs-to-needed_list.patch
similarity index 100%
rename from recipes-devtool/prelink/files/0001-rtld-Add-missing-DT_NEEDED-DSOs-to-needed_list.patch
rename to recipes-devtools/prelink/files/0001-rtld-Add-missing-DT_NEEDED-DSOs-to-needed_list.patch
diff --git a/recipes-devtool/prelink/prelink_%.bbappend b/recipes-devtools/prelink/prelink_%.bbappend
similarity index 100%
rename from recipes-devtool/prelink/prelink_%.bbappend
rename to recipes-devtools/prelink/prelink_%.bbappend
diff --git a/recipes-devtool/qemu/qemu_riscv.bb b/recipes-devtools/qemu/qemu_riscv.bb
similarity index 100%
rename from recipes-devtool/qemu/qemu_riscv.bb
rename to recipes-devtools/qemu/qemu_riscv.bb
diff --git a/recipes-devtool/riscv-tools/files/0001-add-acinclude.m4.patch b/recipes-devtools/riscv-tools/files/0001-add-acinclude.m4.patch
similarity index 100%
rename from recipes-devtool/riscv-tools/files/0001-add-acinclude.m4.patch
rename to recipes-devtools/riscv-tools/files/0001-add-acinclude.m4.patch
diff --git a/recipes-devtool/riscv-tools/files/fesvr-makefile.patch b/recipes-devtools/riscv-tools/files/fesvr-makefile.patch
similarity index 100%
rename from recipes-devtool/riscv-tools/files/fesvr-makefile.patch
rename to recipes-devtools/riscv-tools/files/fesvr-makefile.patch
diff --git a/recipes-devtool/riscv-tools/files/spike-makefile.patch b/recipes-devtools/riscv-tools/files/spike-makefile.patch
similarity index 100%
rename from recipes-devtool/riscv-tools/files/spike-makefile.patch
rename to recipes-devtools/riscv-tools/files/spike-makefile.patch
diff --git a/recipes-devtool/riscv-tools/riscv-fesvr.bb b/recipes-devtools/riscv-tools/riscv-fesvr.bb
similarity index 100%
rename from recipes-devtool/riscv-tools/riscv-fesvr.bb
rename to recipes-devtools/riscv-tools/riscv-fesvr.bb
diff --git a/recipes-devtool/riscv-tools/riscv-pk.bb b/recipes-devtools/riscv-tools/riscv-pk.bb
similarity index 100%
rename from recipes-devtool/riscv-tools/riscv-pk.bb
rename to recipes-devtools/riscv-tools/riscv-pk.bb
diff --git a/recipes-devtool/riscv-tools/riscv-spike.bb b/recipes-devtools/riscv-tools/riscv-spike.bb
similarity index 100%
rename from recipes-devtool/riscv-tools/riscv-spike.bb
rename to recipes-devtools/riscv-tools/riscv-spike.bb
diff --git a/recipes-devtool/rpm/rpm_%.bbappend b/recipes-devtools/rpm/rpm_%.bbappend
similarity index 100%
rename from recipes-devtool/rpm/rpm_%.bbappend
rename to recipes-devtools/rpm/rpm_%.bbappend