diff --git a/test/functional/kernel/tile-icount-tcount-unchecked/CMakeLists.txt b/test/functional/kernel/tile-icount-tcount-direct-unchecked/CMakeLists.txt
similarity index 100%
rename from test/functional/kernel/tile-icount-tcount-unchecked/CMakeLists.txt
rename to test/functional/kernel/tile-icount-tcount-direct-unchecked/CMakeLists.txt
diff --git a/test/functional/kernel/tile-icount-tcount-unchecked/test-kernel-tile-count-unchecked.cpp.in b/test/functional/kernel/tile-icount-tcount-direct-unchecked/test-kernel-tile-count-direct-unchecked.cpp.in
similarity index 100%
rename from test/functional/kernel/tile-icount-tcount-unchecked/test-kernel-tile-count-unchecked.cpp.in
rename to test/functional/kernel/tile-icount-tcount-direct-unchecked/test-kernel-tile-count-direct-unchecked.cpp.in
diff --git a/test/functional/kernel/tile-icount-tcount-unchecked/tests/test-kernel-tile-ForICount-unchecked.hpp b/test/functional/kernel/tile-icount-tcount-direct-unchecked/tests/test-kernel-tile-ForICount-direct-unchecked.hpp
similarity index 100%
rename from test/functional/kernel/tile-icount-tcount-unchecked/tests/test-kernel-tile-ForICount-unchecked.hpp
rename to test/functional/kernel/tile-icount-tcount-direct-unchecked/tests/test-kernel-tile-ForICount-direct-unchecked.hpp
diff --git a/test/functional/kernel/tile-icount-tcount-unchecked/tests/test-kernel-tile-TileTCount-unchecked.hpp b/test/functional/kernel/tile-icount-tcount-direct-unchecked/tests/test-kernel-tile-TileTCount-direct-unchecked.hpp
similarity index 100%
rename from test/functional/kernel/tile-icount-tcount-unchecked/tests/test-kernel-tile-TileTCount-unchecked.hpp
rename to test/functional/kernel/tile-icount-tcount-direct-unchecked/tests/test-kernel-tile-TileTCount-direct-unchecked.hpp
diff --git a/test/functional/launch/nested_unchecked/CMakeLists.txt b/test/functional/launch/nested_direct_unchecked/CMakeLists.txt
similarity index 100%
rename from test/functional/launch/nested_unchecked/CMakeLists.txt
rename to test/functional/launch/nested_direct_unchecked/CMakeLists.txt
diff --git a/test/functional/launch/nested_unchecked/test-launch-nested.cpp.in b/test/functional/launch/nested_direct_unchecked/test-launch-nested.cpp.in
similarity index 100%
rename from test/functional/launch/nested_unchecked/test-launch-nested.cpp.in
rename to test/functional/launch/nested_direct_unchecked/test-launch-nested.cpp.in
diff --git a/test/functional/launch/nested_unchecked/tests/test-launch-nested-Unchecked.hpp b/test/functional/launch/nested_direct_unchecked/tests/test-launch-nested-DirectUnchecked.hpp
similarity index 100%
rename from test/functional/launch/nested_unchecked/tests/test-launch-nested-Unchecked.hpp
rename to test/functional/launch/nested_direct_unchecked/tests/test-launch-nested-DirectUnchecked.hpp
diff --git a/test/functional/launch/nested_tile_unchecked/CMakeLists.txt b/test/functional/launch/nested_tile_direct_unchecked/CMakeLists.txt
similarity index 100%
rename from test/functional/launch/nested_tile_unchecked/CMakeLists.txt
rename to test/functional/launch/nested_tile_direct_unchecked/CMakeLists.txt
diff --git a/test/functional/launch/nested_tile_unchecked/test-launch-nested-tile-unchecked.cpp.in b/test/functional/launch/nested_tile_direct_unchecked/test-launch-nested-tile-direct-unchecked.cpp.in
similarity index 100%
rename from test/functional/launch/nested_tile_unchecked/test-launch-nested-tile-unchecked.cpp.in
rename to test/functional/launch/nested_tile_direct_unchecked/test-launch-nested-tile-direct-unchecked.cpp.in
diff --git a/test/functional/launch/nested_tile_unchecked/tests/test-launch-nested-Tile-Unchecked.hpp b/test/functional/launch/nested_tile_direct_unchecked/tests/test-launch-nested-Tile-DirectUnchecked.hpp
similarity index 100%
rename from test/functional/launch/nested_tile_unchecked/tests/test-launch-nested-Tile-Unchecked.hpp
rename to test/functional/launch/nested_tile_direct_unchecked/tests/test-launch-nested-Tile-DirectUnchecked.hpp
diff --git a/test/functional/launch/tile_icount_tcount_unchecked/CMakeLists.txt b/test/functional/launch/tile_icount_tcount_direct_unchecked/CMakeLists.txt
similarity index 100%
rename from test/functional/launch/tile_icount_tcount_unchecked/CMakeLists.txt
rename to test/functional/launch/tile_icount_tcount_direct_unchecked/CMakeLists.txt
diff --git a/test/functional/launch/tile_icount_tcount_unchecked/test-launch-nested-tile-icount-tcount-unchecked.cpp.in b/test/functional/launch/tile_icount_tcount_direct_unchecked/test-launch-nested-tile-icount-tcount-direct-unchecked.cpp.in
similarity index 100%
rename from test/functional/launch/tile_icount_tcount_unchecked/test-launch-nested-tile-icount-tcount-unchecked.cpp.in
rename to test/functional/launch/tile_icount_tcount_direct_unchecked/test-launch-nested-tile-icount-tcount-direct-unchecked.cpp.in
diff --git a/test/functional/launch/tile_icount_tcount_unchecked/tests/test-launch-nested-Tile-iCount-tCount-Unchecked.hpp b/test/functional/launch/tile_icount_tcount_direct_unchecked/tests/test-launch-nested-Tile-iCount-tCount-DirectUnchecked.hpp
similarity index 100%
rename from test/functional/launch/tile_icount_tcount_unchecked/tests/test-launch-nested-Tile-iCount-tCount-Unchecked.hpp
rename to test/functional/launch/tile_icount_tcount_direct_unchecked/tests/test-launch-nested-Tile-iCount-tCount-DirectUnchecked.hpp
diff --git a/test/include/RAJA_test-launch-unchecked-teams-threads-1D-execpol.hpp b/test/include/RAJA_test-launch-direct-unchecked-teams-threads-1D-execpol.hpp
similarity index 100%
rename from test/include/RAJA_test-launch-unchecked-teams-threads-1D-execpol.hpp
rename to test/include/RAJA_test-launch-direct-unchecked-teams-threads-1D-execpol.hpp
diff --git a/test/include/RAJA_test-launch-unchecked-teams-threads-3D-execpol.hpp b/test/include/RAJA_test-launch-direct-unchecked-teams-threads-3D-execpol.hpp
similarity index 100%
rename from test/include/RAJA_test-launch-unchecked-teams-threads-3D-execpol.hpp
rename to test/include/RAJA_test-launch-direct-unchecked-teams-threads-3D-execpol.hpp