diff --git a/.github/workflows/reusable_dax.yml b/.github/workflows/reusable_dax.yml
index 1a41b11c75..4ea5ddac75 100644
--- a/.github/workflows/reusable_dax.yml
+++ b/.github/workflows/reusable_dax.yml
@@ -31,7 +31,7 @@ env:
   INSTL_DIR : "${{github.workspace}}/../install-dir"
   COVERAGE_DIR : "${{github.workspace}}/coverage"
   COVERAGE_NAME : "exports-coverage-dax"
-  DAX_TESTS: "./test/umf_test-provider_file_memory ./test/umf_test-provider_devdax_memory"
+  DAX_TESTS: "./test/test_provider_file_memory ./test/test_provider_devdax_memory"
 
 jobs:
   dax:
diff --git a/.github/workflows/reusable_multi_numa.yml b/.github/workflows/reusable_multi_numa.yml
index 7c77505516..3c60bebc38 100644
--- a/.github/workflows/reusable_multi_numa.yml
+++ b/.github/workflows/reusable_multi_numa.yml
@@ -10,7 +10,7 @@ env:
   BUILD_DIR : "${{github.workspace}}/build"
   COVERAGE_DIR : "${{github.workspace}}/coverage"
   COVERAGE_NAME : "exports-coverage-multinuma"
-  NUMA_TESTS: "./test/umf_test-memspace_numa ./test/umf_test-provider_os_memory_multiple_numa_nodes"
+  NUMA_TESTS: "./test/test_memspace_numa ./test/test_provider_os_memory_multiple_numa_nodes"
 
 jobs:
   multi_numa:
@@ -60,13 +60,13 @@ jobs:
         # On RHEL, hwloc version is just a little too low.
         # Skip some tests until we upgrade hwloc and update CMake to properly handle local hwloc installation.
         # TODO: fix issue #560
-        # TODO: add issue for -E umf-init_teardown - it is not clear why it fails
+        # TODO: add issue for -E test_init_teardown - it is not clear why it fails
       - name: Run tests (on RHEL)
         if: matrix.os == 'rhel-9.1'
         working-directory: ${{github.workspace}}/build
         run: |
-          ctest --output-on-failure --test-dir test -E "umf-provider_os_memory_multiple_numa_nodes|umf-init_teardown"
-          ./test/umf_test-provider_os_memory_multiple_numa_nodes \
+          ctest --output-on-failure --test-dir test -E "test_provider_os_memory_multiple_numa_nodes|test_init_teardown"
+          ./test/test_provider_os_memory_multiple_numa_nodes \
             --gtest_filter="-*checkModeLocal/*:*checkModePreferredEmptyNodeset/*:testNuma.checkModeInterleave"
 
       - name: Run NUMA tests under valgrind
diff --git a/.github/workflows/reusable_proxy_lib.yml b/.github/workflows/reusable_proxy_lib.yml
index bb4a3278ef..363e665264 100644
--- a/.github/workflows/reusable_proxy_lib.yml
+++ b/.github/workflows/reusable_proxy_lib.yml
@@ -59,9 +59,9 @@ jobs:
         working-directory: ${{env.BUILD_DIR}}
         run: LD_PRELOAD=./lib/libumf_proxy.so ctest --output-on-failure
 
-      - name: Run "./test/umf_test-memoryPool" with proxy library
+      - name: Run "./test/test_memoryPool" with proxy library
         working-directory: ${{env.BUILD_DIR}}
-        run: LD_PRELOAD=./lib/libumf_proxy.so ./test/umf_test-memoryPool
+        run: LD_PRELOAD=./lib/libumf_proxy.so ./test/test_memoryPool
 
       - name: Run "/usr/bin/ls" with proxy library
         working-directory: ${{env.BUILD_DIR}}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ecdde95e12..37f4c809ec 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -45,8 +45,8 @@ function(build_umf_test)
         "${multiValueArgs}"
         ${ARGN})
 
-    set(TEST_NAME umf-${ARG_NAME})
-    set(TEST_TARGET_NAME umf_test-${ARG_NAME})
+    set(TEST_NAME test_${ARG_NAME})
+    set(TEST_TARGET_NAME test_${ARG_NAME})
 
     set(LIB_DIRS ${LIB_DIRS} ${LIBHWLOC_LIBRARY_DIRS})
 
@@ -130,8 +130,8 @@ function(add_umf_test)
         SRCS ${ARG_SRCS}
         LIBS ${ARG_LIBS})
 
-    set(TEST_NAME umf-${ARG_NAME})
-    set(TEST_TARGET_NAME umf_test-${ARG_NAME})
+    set(TEST_NAME test_${ARG_NAME})
+    set(TEST_TARGET_NAME test_${ARG_NAME})
 
     add_test(
         NAME ${TEST_NAME}
@@ -408,7 +408,7 @@ if(UMF_BUILD_GPU_TESTS AND UMF_BUILD_LEVEL_ZERO_PROVIDER)
         SRCS providers/provider_level_zero.cpp
              ${UMF_UTILS_DIR}/utils_level_zero.cpp ${BA_SOURCES_FOR_TEST}
         LIBS ${UMF_UTILS_FOR_TEST})
-    target_compile_definitions(umf_test-provider_level_zero_dlopen_global
+    target_compile_definitions(test_provider_level_zero_dlopen_global
                                PUBLIC USE_DLOPEN=1 OPEN_ZE_LIBRARY_GLOBAL=1)
 
     add_umf_test(
@@ -416,7 +416,7 @@ if(UMF_BUILD_GPU_TESTS AND UMF_BUILD_LEVEL_ZERO_PROVIDER)
         SRCS providers/provider_level_zero.cpp
              ${UMF_UTILS_DIR}/utils_level_zero.cpp ${BA_SOURCES_FOR_TEST}
         LIBS ${UMF_UTILS_FOR_TEST})
-    target_compile_definitions(umf_test-provider_level_zero_dlopen_local
+    target_compile_definitions(test_provider_level_zero_dlopen_local
                                PUBLIC USE_DLOPEN=1 OPEN_ZE_LIBRARY_GLOBAL=0)
 endif()
 
@@ -443,7 +443,7 @@ if(UMF_BUILD_GPU_TESTS AND UMF_BUILD_CUDA_PROVIDER)
             SRCS providers/provider_cuda.cpp providers/cuda_helpers.cpp
                  ${BA_SOURCES_FOR_TEST}
             LIBS ${UMF_UTILS_FOR_TEST})
-        target_compile_definitions(umf_test-provider_cuda_dlopen_global
+        target_compile_definitions(test_provider_cuda_dlopen_global
                                    PUBLIC USE_DLOPEN=1 OPEN_CU_LIBRARY_GLOBAL=1)
 
         add_umf_test(
@@ -451,7 +451,7 @@ if(UMF_BUILD_GPU_TESTS AND UMF_BUILD_CUDA_PROVIDER)
             SRCS providers/provider_cuda.cpp providers/cuda_helpers.cpp
                  ${BA_SOURCES_FOR_TEST}
             LIBS ${UMF_UTILS_FOR_TEST})
-        target_compile_definitions(umf_test-provider_cuda_dlopen_local
+        target_compile_definitions(test_provider_cuda_dlopen_local
                                    PUBLIC USE_DLOPEN=1 OPEN_CU_LIBRARY_GLOBAL=0)
     else()
         message(
@@ -496,7 +496,7 @@ if(UMF_PROXY_LIB_ENABLED AND UMF_BUILD_SHARED_LIBRARY)
             NAME proxy_lib_size_threshold
             SRCS ${BA_SOURCES_FOR_TEST} test_proxy_lib_size_threshold.cpp
             LIBS ${UMF_UTILS_FOR_TEST} umf_proxy)
-        set_property(TEST umf-proxy_lib_size_threshold
+        set_property(TEST test_proxy_lib_size_threshold
                      PROPERTY ENVIRONMENT UMF_PROXY="size.threshold=64")
     endif()
 
@@ -506,7 +506,7 @@ if(UMF_PROXY_LIB_ENABLED AND UMF_BUILD_SHARED_LIBRARY)
         SRCS ${BA_SOURCES_FOR_TEST} memoryPoolAPI.cpp
              malloc_compliance_tests.cpp
         LIBS ${UMF_UTILS_FOR_TEST} umf_proxy)
-    target_compile_definitions(umf_test-proxy_lib_memoryPool
+    target_compile_definitions(test_proxy_lib_memoryPool
                                PUBLIC UMF_PROXY_LIB_ENABLED=1)
 endif()
 
@@ -530,7 +530,7 @@ function(add_umf_ipc_test)
         ""
         ${ARGN})
 
-    set(TEST_NAME umf-${ARG_TEST})
+    set(TEST_NAME test_${ARG_TEST})
 
     if(DEFINED ARG_SRC_DIR)
         set(SRC_DIR ${ARG_SRC_DIR})
@@ -650,7 +650,7 @@ if(LINUX
         LIBS dl)
     # append LD_LIBRARY_PATH to the libumf
     set_property(
-        TEST umf-init_teardown
+        TEST test_init_teardown
         PROPERTY ENVIRONMENT_MODIFICATION
                  "LD_LIBRARY_PATH=path_list_append:${CMAKE_BINARY_DIR}/lib")
 endif()
diff --git a/test/ipc_devdax_prov.sh b/test/ipc_devdax_prov.sh
index 7c5ba36752..43f177c713 100755
--- a/test/ipc_devdax_prov.sh
+++ b/test/ipc_devdax_prov.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2024 Intel Corporation
+# Copyright (C) 2024-2025 Intel Corporation
 #
 # Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -25,10 +25,10 @@ PORT=$(( 1024 + ( $$ % ( 65535 - 1024 ))))
 UMF_LOG_VAL="level:debug;flush:debug;output:stderr;pid:yes"
 
 echo "Starting ipc_devdax_prov CONSUMER on port $PORT ..."
-UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_devdax_prov_consumer $PORT &
+UMF_LOG=$UMF_LOG_VAL ./test_ipc_devdax_prov_consumer $PORT &
 
 echo "Waiting 1 sec ..."
 sleep 1
 
 echo "Starting ipc_devdax_prov PRODUCER on port $PORT ..."
-UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_devdax_prov_producer $PORT
+UMF_LOG=$UMF_LOG_VAL ./test_ipc_devdax_prov_producer $PORT
diff --git a/test/ipc_file_prov.sh b/test/ipc_file_prov.sh
index b3e3091a8f..629b2cbb79 100755
--- a/test/ipc_file_prov.sh
+++ b/test/ipc_file_prov.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2024 Intel Corporation
+# Copyright (C) 2024-2025 Intel Corporation
 #
 # Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -20,13 +20,13 @@ UMF_LOG_VAL="level:debug;flush:debug;output:stderr;pid:yes"
 rm -f ${FILE_NAME}
 
 echo "Starting ipc_file_prov CONSUMER on port $PORT ..."
-UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_file_prov_consumer $PORT ${FILE_NAME}_consumer &
+UMF_LOG=$UMF_LOG_VAL ./test_ipc_file_prov_consumer $PORT ${FILE_NAME}_consumer &
 
 echo "Waiting 1 sec ..."
 sleep 1
 
 echo "Starting ipc_file_prov PRODUCER on port $PORT ..."
-UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_file_prov_producer $PORT ${FILE_NAME}_producer
+UMF_LOG=$UMF_LOG_VAL ./test_ipc_file_prov_producer $PORT ${FILE_NAME}_producer
 
 # remove the SHM file
 rm -f ${FILE_NAME}
diff --git a/test/ipc_file_prov_fsdax.sh b/test/ipc_file_prov_fsdax.sh
index 4e908869b7..314d0aa667 100755
--- a/test/ipc_file_prov_fsdax.sh
+++ b/test/ipc_file_prov_fsdax.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2024 Intel Corporation
+# Copyright (C) 2024-2025 Intel Corporation
 #
 # Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -31,13 +31,13 @@ UMF_LOG_VAL="level:debug;flush:debug;output:stderr;pid:yes"
 rm -f ${FILE_NAME}
 
 echo "Starting ipc_file_prov_fsdax CONSUMER on port $PORT ..."
-UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_file_prov_consumer $PORT $FILE_NAME &
+UMF_LOG=$UMF_LOG_VAL ./test_ipc_file_prov_consumer $PORT $FILE_NAME &
 
 echo "Waiting 1 sec ..."
 sleep 1
 
 echo "Starting ipc_file_prov_fsdax PRODUCER on port $PORT ..."
-UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_file_prov_producer $PORT $FILE_NAME_2
+UMF_LOG=$UMF_LOG_VAL ./test_ipc_file_prov_producer $PORT $FILE_NAME_2
 
 # remove the SHM file
 rm -f ${FILE_NAME}
diff --git a/test/ipc_os_prov_anon_fd.sh b/test/ipc_os_prov_anon_fd.sh
index a42d820a25..4e9a0f8327 100755
--- a/test/ipc_os_prov_anon_fd.sh
+++ b/test/ipc_os_prov_anon_fd.sh
@@ -15,10 +15,10 @@ PORT=$(( 1024 + ( $$ % ( 65535 - 1024 ))))
 UMF_LOG_VAL="level:debug;flush:debug;output:stderr;pid:yes"
 
 echo "Starting ipc_os_prov_anon_fd CONSUMER on port $PORT ..."
-UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_os_prov_consumer $PORT &
+UMF_LOG=$UMF_LOG_VAL ./test_ipc_os_prov_consumer $PORT &
 
 echo "Waiting 1 sec ..."
 sleep 1
 
 echo "Starting ipc_os_prov_anon_fd PRODUCER on port $PORT ..."
-UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_os_prov_producer $PORT
+UMF_LOG=$UMF_LOG_VAL ./test_ipc_os_prov_producer $PORT
diff --git a/test/ipc_os_prov_proxy.sh b/test/ipc_os_prov_proxy.sh
index 86b95a2356..9bd02dad84 100755
--- a/test/ipc_os_prov_proxy.sh
+++ b/test/ipc_os_prov_proxy.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2024 Intel Corporation
+# Copyright (C) 2024-2025 Intel Corporation
 #
 # Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -17,10 +17,10 @@ LD_PRELOAD_VAL="../lib/libumf_proxy.so"
 PORT=$(( 1024 + ( $$ % ( 65535 - 1024 ))))
 
 echo "Starting CONSUMER on port $PORT ..."
-UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_os_prov_consumer $PORT &
+UMF_LOG=$UMF_LOG_VAL ./test_ipc_os_prov_consumer $PORT &
 
 echo "Waiting 1 sec ..."
 sleep 1
 
 echo "Starting ipc_os_prov_proxy PRODUCER on port $PORT ..."
-LD_PRELOAD=$LD_PRELOAD_VAL UMF_LOG=$UMF_LOG_VAL UMF_PROXY=$UMF_PROXY_VAL ./umf_test-ipc_os_prov_proxy $PORT
+LD_PRELOAD=$LD_PRELOAD_VAL UMF_LOG=$UMF_LOG_VAL UMF_PROXY=$UMF_PROXY_VAL ./test_ipc_os_prov_proxy $PORT
diff --git a/test/ipc_os_prov_shm.sh b/test/ipc_os_prov_shm.sh
index efa2de35ae..7bde3c6135 100755
--- a/test/ipc_os_prov_shm.sh
+++ b/test/ipc_os_prov_shm.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2024 Intel Corporation
+# Copyright (C) 2024-2025 Intel Corporation
 #
 # Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -20,13 +20,13 @@ UMF_LOG_VAL="level:debug;flush:debug;output:stderr;pid:yes"
 rm -f /dev/shm/${SHM_NAME}
 
 echo "Starting ipc_os_prov_shm CONSUMER on port $PORT ..."
-UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_os_prov_consumer $PORT &
+UMF_LOG=$UMF_LOG_VAL ./test_ipc_os_prov_consumer $PORT &
 
 echo "Waiting 1 sec ..."
 sleep 1
 
 echo "Starting ipc_os_prov_shm PRODUCER on port $PORT ..."
-UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_os_prov_producer $PORT $SHM_NAME
+UMF_LOG=$UMF_LOG_VAL ./test_ipc_os_prov_producer $PORT $SHM_NAME
 
 # remove the SHM file
 rm -f /dev/shm/${SHM_NAME}
diff --git a/test/providers/ipc_cuda_prov.sh b/test/providers/ipc_cuda_prov.sh
index 1e9b6b05d4..bb4be94747 100755
--- a/test/providers/ipc_cuda_prov.sh
+++ b/test/providers/ipc_cuda_prov.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2024 Intel Corporation
+# Copyright (C) 2024-2025 Intel Corporation
 #
 # Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -15,10 +15,10 @@ PORT=$(( 1024 + ( $$ % ( 65535 - 1024 ))))
 UMF_LOG_VAL="level:debug;flush:debug;output:stderr;pid:yes"
 
 echo "Starting ipc_cuda_prov CONSUMER on port $PORT ..."
-UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_cuda_prov_consumer $PORT &
+UMF_LOG=$UMF_LOG_VAL ./test_ipc_cuda_prov_consumer $PORT &
 
 echo "Waiting 1 sec ..."
 sleep 1
 
 echo "Starting ipc_cuda_prov PRODUCER on port $PORT ..."
-UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_cuda_prov_producer $PORT
+UMF_LOG=$UMF_LOG_VAL ./test_ipc_cuda_prov_producer $PORT
diff --git a/test/providers/ipc_level_zero_prov.sh b/test/providers/ipc_level_zero_prov.sh
index 4d29677257..cebd909328 100755
--- a/test/providers/ipc_level_zero_prov.sh
+++ b/test/providers/ipc_level_zero_prov.sh
@@ -15,10 +15,10 @@ PORT=$(( 1024 + ( $$ % ( 65535 - 1024 ))))
 UMF_LOG_VAL="level:debug;flush:debug;output:stderr;pid:yes"
 
 echo "Starting ipc_level_zero_prov CONSUMER on port $PORT ..."
-UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_level_zero_prov_consumer $PORT &
+UMF_LOG=$UMF_LOG_VAL ./test_ipc_level_zero_prov_consumer $PORT &
 
 echo "Waiting 1 sec ..."
 sleep 1
 
 echo "Starting ipc_level_zero_prov PRODUCER on port $PORT ..."
-UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_level_zero_prov_producer $PORT
+UMF_LOG=$UMF_LOG_VAL ./test_ipc_level_zero_prov_producer $PORT
diff --git a/test/supp/drd-umf_test-disjoint_pool.supp b/test/supp/drd-test_disjoint_pool.supp
similarity index 100%
rename from test/supp/drd-umf_test-disjoint_pool.supp
rename to test/supp/drd-test_disjoint_pool.supp
diff --git a/test/supp/drd-umf_test-ipc.supp b/test/supp/drd-test_ipc.supp
similarity index 100%
rename from test/supp/drd-umf_test-ipc.supp
rename to test/supp/drd-test_ipc.supp
diff --git a/test/supp/drd-umf_test-jemalloc_coarse_devdax.supp b/test/supp/drd-test_jemalloc_coarse_devdax.supp
similarity index 100%
rename from test/supp/drd-umf_test-jemalloc_coarse_devdax.supp
rename to test/supp/drd-test_jemalloc_coarse_devdax.supp
diff --git a/test/supp/drd-umf_test-jemalloc_coarse_file.supp b/test/supp/drd-test_jemalloc_coarse_file.supp
similarity index 100%
rename from test/supp/drd-umf_test-jemalloc_coarse_file.supp
rename to test/supp/drd-test_jemalloc_coarse_file.supp
diff --git a/test/supp/drd-umf_test-jemalloc_pool.supp b/test/supp/drd-test_jemalloc_pool.supp
similarity index 100%
rename from test/supp/drd-umf_test-jemalloc_pool.supp
rename to test/supp/drd-test_jemalloc_pool.supp
diff --git a/test/supp/drd-umf_test-provider_devdax_memory_ipc.supp b/test/supp/drd-test_provider_devdax_memory_ipc.supp
similarity index 100%
rename from test/supp/drd-umf_test-provider_devdax_memory_ipc.supp
rename to test/supp/drd-test_provider_devdax_memory_ipc.supp
diff --git a/test/supp/drd-umf_test-provider_file_memory_ipc.supp b/test/supp/drd-test_provider_file_memory_ipc.supp
similarity index 100%
rename from test/supp/drd-umf_test-provider_file_memory_ipc.supp
rename to test/supp/drd-test_provider_file_memory_ipc.supp
diff --git a/test/supp/drd-umf_test-provider_os_memory.supp b/test/supp/drd-test_provider_os_memory.supp
similarity index 100%
rename from test/supp/drd-umf_test-provider_os_memory.supp
rename to test/supp/drd-test_provider_os_memory.supp
diff --git a/test/supp/drd-umf_test-scalable_coarse_devdax.supp b/test/supp/drd-test_scalable_coarse_devdax.supp
similarity index 100%
rename from test/supp/drd-umf_test-scalable_coarse_devdax.supp
rename to test/supp/drd-test_scalable_coarse_devdax.supp
diff --git a/test/supp/drd-umf_test-scalable_coarse_file.supp b/test/supp/drd-test_scalable_coarse_file.supp
similarity index 100%
rename from test/supp/drd-umf_test-scalable_coarse_file.supp
rename to test/supp/drd-test_scalable_coarse_file.supp
diff --git a/test/supp/drd-umf_test-scalable_pool.supp b/test/supp/drd-test_scalable_pool.supp
similarity index 100%
rename from test/supp/drd-umf_test-scalable_pool.supp
rename to test/supp/drd-test_scalable_pool.supp
diff --git a/test/supp/helgrind-umf_test-disjoint_pool.supp b/test/supp/helgrind-test_disjoint_pool.supp
similarity index 100%
rename from test/supp/helgrind-umf_test-disjoint_pool.supp
rename to test/supp/helgrind-test_disjoint_pool.supp
diff --git a/test/supp/helgrind-umf_test-ipc.supp b/test/supp/helgrind-test_ipc.supp
similarity index 100%
rename from test/supp/helgrind-umf_test-ipc.supp
rename to test/supp/helgrind-test_ipc.supp
diff --git a/test/supp/helgrind-umf_test-jemalloc_coarse_devdax.supp b/test/supp/helgrind-test_jemalloc_coarse_devdax.supp
similarity index 100%
rename from test/supp/helgrind-umf_test-jemalloc_coarse_devdax.supp
rename to test/supp/helgrind-test_jemalloc_coarse_devdax.supp
diff --git a/test/supp/helgrind-umf_test-jemalloc_coarse_file.supp b/test/supp/helgrind-test_jemalloc_coarse_file.supp
similarity index 100%
rename from test/supp/helgrind-umf_test-jemalloc_coarse_file.supp
rename to test/supp/helgrind-test_jemalloc_coarse_file.supp
diff --git a/test/supp/helgrind-umf_test-jemalloc_pool.supp b/test/supp/helgrind-test_jemalloc_pool.supp
similarity index 100%
rename from test/supp/helgrind-umf_test-jemalloc_pool.supp
rename to test/supp/helgrind-test_jemalloc_pool.supp
diff --git a/test/supp/helgrind-umf_test-provider_devdax_memory_ipc.supp b/test/supp/helgrind-test_provider_devdax_memory_ipc.supp
similarity index 100%
rename from test/supp/helgrind-umf_test-provider_devdax_memory_ipc.supp
rename to test/supp/helgrind-test_provider_devdax_memory_ipc.supp
diff --git a/test/supp/helgrind-umf_test-provider_file_memory_ipc.supp b/test/supp/helgrind-test_provider_file_memory_ipc.supp
similarity index 100%
rename from test/supp/helgrind-umf_test-provider_file_memory_ipc.supp
rename to test/supp/helgrind-test_provider_file_memory_ipc.supp
diff --git a/test/supp/helgrind-umf_test-provider_os_memory.supp b/test/supp/helgrind-test_provider_os_memory.supp
similarity index 100%
rename from test/supp/helgrind-umf_test-provider_os_memory.supp
rename to test/supp/helgrind-test_provider_os_memory.supp
diff --git a/test/supp/helgrind-umf_test-scalable_coarse_devdax.supp b/test/supp/helgrind-test_scalable_coarse_devdax.supp
similarity index 100%
rename from test/supp/helgrind-umf_test-scalable_coarse_devdax.supp
rename to test/supp/helgrind-test_scalable_coarse_devdax.supp
diff --git a/test/supp/helgrind-umf_test-scalable_coarse_file.supp b/test/supp/helgrind-test_scalable_coarse_file.supp
similarity index 100%
rename from test/supp/helgrind-umf_test-scalable_coarse_file.supp
rename to test/supp/helgrind-test_scalable_coarse_file.supp
diff --git a/test/supp/helgrind-umf_test-scalable_pool.supp b/test/supp/helgrind-test_scalable_pool.supp
similarity index 100%
rename from test/supp/helgrind-umf_test-scalable_pool.supp
rename to test/supp/helgrind-test_scalable_pool.supp
diff --git a/test/supp/memcheck-umf_test-jemalloc_coarse_devdax.supp b/test/supp/memcheck-test_jemalloc_coarse_devdax.supp
similarity index 100%
rename from test/supp/memcheck-umf_test-jemalloc_coarse_devdax.supp
rename to test/supp/memcheck-test_jemalloc_coarse_devdax.supp
diff --git a/test/supp/memcheck-umf_test-jemalloc_coarse_file.supp b/test/supp/memcheck-test_jemalloc_coarse_file.supp
similarity index 100%
rename from test/supp/memcheck-umf_test-jemalloc_coarse_file.supp
rename to test/supp/memcheck-test_jemalloc_coarse_file.supp
diff --git a/test/supp/memcheck-umf_test-jemalloc_pool.supp b/test/supp/memcheck-test_jemalloc_pool.supp
similarity index 100%
rename from test/supp/memcheck-umf_test-jemalloc_pool.supp
rename to test/supp/memcheck-test_jemalloc_pool.supp
diff --git a/test/supp/memcheck-umf_test-scalable_pool.supp b/test/supp/memcheck-test_scalable_pool.supp
similarity index 100%
rename from test/supp/memcheck-umf_test-scalable_pool.supp
rename to test/supp/memcheck-test_scalable_pool.supp
diff --git a/test/test_valgrind.sh b/test/test_valgrind.sh
index 954a3a56bb..ea156e620b 100755
--- a/test/test_valgrind.sh
+++ b/test/test_valgrind.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (C) 2024 Intel Corporation
+# Copyright (C) 2024-2025 Intel Corporation
 # Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
@@ -16,7 +16,7 @@ function print_usage() {
 	echo "Where:"
 	echo
 	echo "tests_examples - (optional) list of tests or examples to be run (paths relative to the <build_dir> build directory)."
-	echo "                 If it is empty, all tests (./test/umf_test-*) and examples (./examples/umf_example_*)"
+	echo "                 If it is empty, all tests (./test/test_*) and examples (./examples/umf_example_*)"
 	echo "                 found in <build_dir> will be run."
 }
 
@@ -37,8 +37,8 @@ if [ ! -f $WORKSPACE/README.md ]; then
 	exit 1
 fi
 
-if [ $(ls -1 ${BUILD_DIR}/test/umf_test-* 2>/dev/null | wc -l) -eq 0 ]; then
-	echo -e "error: UMF tests ./test/umf_test-* not found in the build directory: ${BUILD_DIR}\n"
+if [ $(ls -1 ${BUILD_DIR}/test/test_* 2>/dev/null | wc -l) -eq 0 ]; then
+	echo -e "error: UMF tests ./test/test_* not found in the build directory: ${BUILD_DIR}\n"
 	print_usage
 	exit 1
 fi
@@ -74,7 +74,7 @@ echo "Working directory: $(pwd)"
 echo "Running: \"valgrind $OPTION\" for the following tests:"
 
 ANY_TEST_FAILED=0
-PATH_TESTS="./test/umf_test-*"
+PATH_TESTS="./test/test_*"
 PATH_EXAMPLES="./examples/umf_example_*"
 
 rm -f ${PATH_TESTS}.log ${PATH_TESTS}.err ${PATH_EXAMPLES}.log ${PATH_EXAMPLES}.err
@@ -100,7 +100,7 @@ for test in $TESTS; do
 	# skip tests incompatible with valgrind
 	FILTER=""
 	case $test in
-	./test/umf_test-disjointPool)
+	./test/test_disjointPool)
 		if [ "$TOOL" = "helgrind" ]; then
 			# skip because of the assert in helgrind:
 			# Helgrind: hg_main.c:308 (lockN_acquire_reader): Assertion 'lk->kind == LK_rdwr' failed.
@@ -108,40 +108,40 @@ for test in $TESTS; do
 			continue;
 		fi
 		;;
-	./test/umf_test-ipc_os_prov_*)
+	./test/test_ipc_os_prov_*)
 		echo "- SKIPPED"
 		continue; # skip testing helper binaries used by the ipc_os_prov_* tests
 		;;
-	./test/umf_test-ipc_devdax_prov_*)
+	./test/test_ipc_devdax_prov_*)
 		echo "- SKIPPED"
 		continue; # skip testing helper binaries used by the ipc_devdax_prov_* tests
 		;;
-	./test/umf_test-ipc_file_prov_*)
+	./test/test_ipc_file_prov_*)
 		echo "- SKIPPED"
 		continue; # skip testing helper binaries used by the ipc_file_prov_* tests
 		;;
-	./test/umf_test-memspace_host_all)
+	./test/test_memspace_host_all)
 		FILTER='--gtest_filter="-*allocsSpreadAcrossAllNumaNodes"'
 		;;
-	./test/umf_test-provider_os_memory)
+	./test/test_provider_os_memory)
 		FILTER='--gtest_filter="-osProviderTest/umfIpcTest*"'
 		;;
-	./test/umf_test-provider_os_memory_config)
+	./test/test_provider_os_memory_config)
 		FILTER='--gtest_filter="-*protection_flag_none:*protection_flag_read:*providerConfigTestNumaMode*"'
 		;;
-	./test/umf_test-memspace_highest_capacity)
+	./test/test_memspace_highest_capacity)
 		FILTER='--gtest_filter="-*highestCapacityVerify*"'
 		;;
-	./test/umf_test-provider_os_memory_multiple_numa_nodes)
+	./test/test_provider_os_memory_multiple_numa_nodes)
 		FILTER='--gtest_filter="-testNuma.checkModeInterleave*:testNumaNodesAllocations/testNumaOnEachNode.checkNumaNodesAllocations*:testNumaNodesAllocations/testNumaOnEachNode.checkModePreferred*:testNumaNodesAllocations/testNumaOnEachNode.checkModeInterleaveSingleNode*:testNumaNodesAllocationsAllCpus/testNumaOnEachCpu.checkModePreferredEmptyNodeset*:testNumaNodesAllocationsAllCpus/testNumaOnEachCpu.checkModeLocal*"'
 		;;
-	./test/umf_test-memspace_highest_bandwidth)
+	./test/test_memspace_highest_bandwidth)
 		FILTER='--gtest_filter="-*allocLocalMt*"'
 		;;
-	./test/umf_test-memspace_lowest_latency)
+	./test/test_memspace_lowest_latency)
 		FILTER='--gtest_filter="-*allocLocalMt*"'
 		;;
-	./test/umf_test-memoryPool)
+	./test/test_memoryPool)
 		FILTER='--gtest_filter="-*allocMaxSize*"'
 		;;
 	./examples/umf_example_ipc_ipcapi_*)