diff --git a/tests/kernel/threads/customdata/cdata_api/Makefile b/tests/kernel/threads/custom_data/custom_data_api/Makefile
similarity index 100%
rename from tests/kernel/threads/customdata/cdata_api/Makefile
rename to tests/kernel/threads/custom_data/custom_data_api/Makefile
diff --git a/tests/kernel/threads/customdata/cdata_api/README b/tests/kernel/threads/custom_data/custom_data_api/README
similarity index 100%
rename from tests/kernel/threads/customdata/cdata_api/README
rename to tests/kernel/threads/custom_data/custom_data_api/README
diff --git a/tests/kernel/threads/customdata/cdata_api/prj.conf b/tests/kernel/threads/custom_data/custom_data_api/prj.conf
similarity index 100%
rename from tests/kernel/threads/customdata/cdata_api/prj.conf
rename to tests/kernel/threads/custom_data/custom_data_api/prj.conf
diff --git a/tests/kernel/threads/customdata/cdata_api/src/Makefile b/tests/kernel/threads/custom_data/custom_data_api/src/Makefile
similarity index 100%
rename from tests/kernel/threads/customdata/cdata_api/src/Makefile
rename to tests/kernel/threads/custom_data/custom_data_api/src/Makefile
diff --git a/tests/kernel/threads/customdata/cdata_api/src/main.c b/tests/kernel/threads/custom_data/custom_data_api/src/main.c
similarity index 100%
rename from tests/kernel/threads/customdata/cdata_api/src/main.c
rename to tests/kernel/threads/custom_data/custom_data_api/src/main.c
diff --git a/tests/kernel/threads/customdata/cdata_api/src/test_cdata.h b/tests/kernel/threads/custom_data/custom_data_api/src/test_cdata.h
similarity index 100%
rename from tests/kernel/threads/customdata/cdata_api/src/test_cdata.h
rename to tests/kernel/threads/custom_data/custom_data_api/src/test_cdata.h
diff --git a/tests/kernel/threads/customdata/cdata_api/src/test_customdata_api.c b/tests/kernel/threads/custom_data/custom_data_api/src/test_customdata_api.c
similarity index 100%
rename from tests/kernel/threads/customdata/cdata_api/src/test_customdata_api.c
rename to tests/kernel/threads/custom_data/custom_data_api/src/test_customdata_api.c
diff --git a/tests/kernel/threads/customdata/cdata_api/testcase.ini b/tests/kernel/threads/custom_data/custom_data_api/testcase.ini
similarity index 100%
rename from tests/kernel/threads/customdata/cdata_api/testcase.ini
rename to tests/kernel/threads/custom_data/custom_data_api/testcase.ini