From 2e4144a446eb8749049dcbb0dc7d8ce7d411e24c Mon Sep 17 00:00:00 2001
From: Sergey Kopienko <sergey.kopienko@intel.com>
Date: Thu, 4 Jul 2024 12:23:52 +0200
Subject: [PATCH] Fix review comment: rename splitted files

Signed-off-by: Sergey Kopienko <sergey.kopienko@intel.com>
---
 ...erence.pass.cpp => sycl_iterator_adjacent_difference.pass.cpp} | 0
 ...djacent_find.pass.cpp => sycl_iterator_adjacent_find.pass.cpp} | 0
 ...ll_none_of.pass.cpp => sycl_iterator_any_all_none_of.pass.cpp} | 0
 ...terator_for_test_copy.pass.cpp => sycl_iterator_copy.pass.cpp} | 0
 ..._scan_test_copy_if.pass.cpp => sycl_iterator_copy_if.pass.cpp} | 0
 ...tor_for_test_copy_n.pass.cpp => sycl_iterator_copy_n.pass.cpp} | 0
 ...or_reduce_test_count.pass.cpp => sycl_iterator_count.pass.cpp} | 0
 ...uce_test_count_if.pass.cpp => sycl_iterator_count_if.pass.cpp} | 0
 ...r_for_test_destroy.pass.cpp => sycl_iterator_destroy.pass.cpp} | 0
 ...r_test_destroy_n.pass.cpp => sycl_iterator_destroy_n.pass.cpp} | 0
 ...ator_find_test_equal.pass.cpp => sycl_iterator_equal.pass.cpp} | 0
 ...terator_for_test_fill.pass.cpp => sycl_iterator_fill.pass.cpp} | 0
 ...tor_for_test_fill_n.pass.cpp => sycl_iterator_fill_n.pass.cpp} | 0
 ...ind_test_find_end.pass.cpp => sycl_iterator_find_end.pass.cpp} | 0
 ...ind_first_of.pass.cpp => sycl_iterator_find_first_of.pass.cpp} | 0
 ..._find_test_find_if.pass.cpp => sycl_iterator_find_if.pass.cpp} | 0
 ...for_test_for_each.pass.cpp => sycl_iterator_for_each.pass.cpp} | 0
 ...test_for_each_n.pass.cpp => sycl_iterator_for_each_n.pass.cpp} | 0
 ...for_test_generate.pass.cpp => sycl_iterator_generate.pass.cpp} | 0
 ...test_generate_n.pass.cpp => sycl_iterator_generate_n.pass.cpp} | 0
 ...for_test_includes.pass.cpp => sycl_iterator_includes.pass.cpp} | 0
 ...nplace_merge.pass.cpp => sycl_iterator_inplace_merge.pass.cpp} | 0
 ..._find_test_is_heap.pass.cpp => sycl_iterator_is_heap.pass.cpp} | 0
 ...s_heap_until.pass.cpp => sycl_iterator_is_heap_until.pass.cpp} | 0
 ...partitioned.pass.cpp => sycl_iterator_is_partitioned.pass.cpp} | 0
 ...d_test_is_sorted.pass.cpp => sycl_iterator_is_sorted.pass.cpp} | 0
 ...rted_until.pass.cpp => sycl_iterator_is_sorted_until.pass.cpp} | 0
 ...re.pass.cpp => sycl_iterator_lexicographical_compare.pass.cpp} | 0
 ...st_max_element.pass.cpp => sycl_iterator_max_element.pass.cpp} | 0
 ...ator_sort_test_merge.pass.cpp => sycl_iterator_merge.pass.cpp} | 0
 ...st_min_element.pass.cpp => sycl_iterator_min_element.pass.cpp} | 0
 ...max_element.pass.cpp => sycl_iterator_minmax_element.pass.cpp} | 0
 ...ind_test_mismatch.pass.cpp => sycl_iterator_mismatch.pass.cpp} | 0
 ...terator_for_test_move.pass.cpp => sycl_iterator_move.pass.cpp} | 0
 ...st_nth_element.pass.cpp => sycl_iterator_nth_element.pass.cpp} | 0
 ..._partial_sort.pass.cpp => sycl_iterator_partial_sort.pass.cpp} | 0
 ...ort_copy.pass.cpp => sycl_iterator_partial_sort_copy.pass.cpp} | 0
 ...n_test_partition.pass.cpp => sycl_iterator_partition.pass.cpp} | 0
 ...tition_copy.pass.cpp => sycl_iterator_partition_copy.pass.cpp} | 0
 ..._reduce_test_reduce.pass.cpp => sycl_iterator_reduce.pass.cpp} | 0
 ...or_scan_test_remove.pass.cpp => sycl_iterator_remove.pass.cpp} | 0
 ...n_test_remove_if.pass.cpp => sycl_iterator_remove_if.pass.cpp} | 0
 ...r_for_test_replace.pass.cpp => sycl_iterator_replace.pass.cpp} | 0
 ..._replace_copy.pass.cpp => sycl_iterator_replace_copy.pass.cpp} | 0
 ...ce_copy_if.pass.cpp => sycl_iterator_replace_copy_if.pass.cpp} | 0
 ...test_replace_if.pass.cpp => sycl_iterator_replace_if.pass.cpp} | 0
 ...r_for_test_reverse.pass.cpp => sycl_iterator_reverse.pass.cpp} | 0
 ..._reverse_copy.pass.cpp => sycl_iterator_reverse_copy.pass.cpp} | 0
 ...tor_for_test_rotate.pass.cpp => sycl_iterator_rotate.pass.cpp} | 0
 ...st_rotate_copy.pass.cpp => sycl_iterator_rotate_copy.pass.cpp} | 0
 ...or_find_test_search.pass.cpp => sycl_iterator_search.pass.cpp} | 0
 ...ind_test_search_n.pass.cpp => sycl_iterator_search_n.pass.cpp} | 0
 ..._difference.pass.cpp => sycl_iterator_set_difference.pass.cpp} | 0
 ...ersection.pass.cpp => sycl_iterator_set_intersection.pass.cpp} | 0
 ...e.pass.cpp => sycl_iterator_set_symmetric_difference.pass.cpp} | 0
 ...n_test_set_union.pass.cpp => sycl_iterator_set_union.pass.cpp} | 0
 ...erator_sort_test_sort.pass.cpp => sycl_iterator_sort.pass.cpp} | 0
 ...st_stable_sort.pass.cpp => sycl_iterator_stable_sort.pass.cpp} | 0
 ...st_swap_ranges.pass.cpp => sycl_iterator_swap_ranges.pass.cpp} | 0
 ...rm_binary.pass.cpp => sycl_iterator_transform_binary.pass.cpp} | 0
 ...n.pass.cpp => sycl_iterator_transform_exclusive_scan.pass.cpp} | 0
 ...n.pass.cpp => sycl_iterator_transform_inclusive_scan.pass.cpp} | 0
 ...ry.pass.cpp => sycl_iterator_transform_reduce_binary.pass.cpp} | 0
 ...ary.pass.cpp => sycl_iterator_transform_reduce_unary.pass.cpp} | 0
 ...form_unary.pass.cpp => sycl_iterator_transform_unary.pass.cpp} | 0
 ...ed_copy.pass.cpp => sycl_iterator_uninitialized_copy.pass.cpp} | 0
 ...opy_n.pass.cpp => sycl_iterator_uninitialized_copy_n.pass.cpp} | 0
 ...cpp => sycl_iterator_uninitialized_default_construct.pass.cpp} | 0
 ...p => sycl_iterator_uninitialized_default_construct_n.pass.cpp} | 0
 ...ed_fill.pass.cpp => sycl_iterator_uninitialized_fill.pass.cpp} | 0
 ...ill_n.pass.cpp => sycl_iterator_uninitialized_fill_n.pass.cpp} | 0
 ...ed_move.pass.cpp => sycl_iterator_uninitialized_move.pass.cpp} | 0
 ...ove_n.pass.cpp => sycl_iterator_uninitialized_move_n.pass.cpp} | 0
 ...s.cpp => sycl_iterator_uninitialized_value_construct.pass.cpp} | 0
 ...cpp => sycl_iterator_uninitialized_value_construct_n.pass.cpp} | 0
 ...or_scan_test_unique.pass.cpp => sycl_iterator_unique.pass.cpp} | 0
 ...st_unique_copy.pass.cpp => sycl_iterator_unique_copy.pass.cpp} | 0
 77 files changed, 0 insertions(+), 0 deletions(-)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_adjacent_difference.pass.cpp => sycl_iterator_adjacent_difference.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_find_test_adjacent_find.pass.cpp => sycl_iterator_adjacent_find.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_find_test_any_all_none_of.pass.cpp => sycl_iterator_any_all_none_of.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_copy.pass.cpp => sycl_iterator_copy.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_scan_test_copy_if.pass.cpp => sycl_iterator_copy_if.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_copy_n.pass.cpp => sycl_iterator_copy_n.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_reduce_test_count.pass.cpp => sycl_iterator_count.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_reduce_test_count_if.pass.cpp => sycl_iterator_count_if.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_destroy.pass.cpp => sycl_iterator_destroy.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_destroy_n.pass.cpp => sycl_iterator_destroy_n.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_find_test_equal.pass.cpp => sycl_iterator_equal.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_fill.pass.cpp => sycl_iterator_fill.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_fill_n.pass.cpp => sycl_iterator_fill_n.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_find_test_find_end.pass.cpp => sycl_iterator_find_end.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_find_test_find_first_of.pass.cpp => sycl_iterator_find_first_of.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_find_test_find_if.pass.cpp => sycl_iterator_find_if.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_for_each.pass.cpp => sycl_iterator_for_each.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_for_each_n.pass.cpp => sycl_iterator_for_each_n.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_generate.pass.cpp => sycl_iterator_generate.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_generate_n.pass.cpp => sycl_iterator_generate_n.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_includes.pass.cpp => sycl_iterator_includes.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_sort_test_inplace_merge.pass.cpp => sycl_iterator_inplace_merge.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_find_test_is_heap.pass.cpp => sycl_iterator_is_heap.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_find_test_is_heap_until.pass.cpp => sycl_iterator_is_heap_until.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_reduce_test_is_partitioned.pass.cpp => sycl_iterator_is_partitioned.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_find_test_is_sorted.pass.cpp => sycl_iterator_is_sorted.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_find_test_is_sorted_until.pass.cpp => sycl_iterator_is_sorted_until.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_reduce_test_lexicographical_compare.pass.cpp => sycl_iterator_lexicographical_compare.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_reduce_test_max_element.pass.cpp => sycl_iterator_max_element.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_sort_test_merge.pass.cpp => sycl_iterator_merge.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_reduce_test_min_element.pass.cpp => sycl_iterator_min_element.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_reduce_test_minmax_element.pass.cpp => sycl_iterator_minmax_element.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_find_test_mismatch.pass.cpp => sycl_iterator_mismatch.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_move.pass.cpp => sycl_iterator_move.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_sort_test_nth_element.pass.cpp => sycl_iterator_nth_element.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_sort_test_partial_sort.pass.cpp => sycl_iterator_partial_sort.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_sort_test_partial_sort_copy.pass.cpp => sycl_iterator_partial_sort_copy.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_scan_test_partition.pass.cpp => sycl_iterator_partition.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_scan_test_partition_copy.pass.cpp => sycl_iterator_partition_copy.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_reduce_test_reduce.pass.cpp => sycl_iterator_reduce.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_scan_test_remove.pass.cpp => sycl_iterator_remove.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_scan_test_remove_if.pass.cpp => sycl_iterator_remove_if.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_replace.pass.cpp => sycl_iterator_replace.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_replace_copy.pass.cpp => sycl_iterator_replace_copy.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_replace_copy_if.pass.cpp => sycl_iterator_replace_copy_if.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_replace_if.pass.cpp => sycl_iterator_replace_if.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_reverse.pass.cpp => sycl_iterator_reverse.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_reverse_copy.pass.cpp => sycl_iterator_reverse_copy.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_rotate.pass.cpp => sycl_iterator_rotate.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_rotate_copy.pass.cpp => sycl_iterator_rotate_copy.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_find_test_search.pass.cpp => sycl_iterator_search.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_find_test_search_n.pass.cpp => sycl_iterator_search_n.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_scan_test_set_difference.pass.cpp => sycl_iterator_set_difference.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_scan_test_set_intersection.pass.cpp => sycl_iterator_set_intersection.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_scan_test_set_symmetric_difference.pass.cpp => sycl_iterator_set_symmetric_difference.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_scan_test_set_union.pass.cpp => sycl_iterator_set_union.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_sort_test_sort.pass.cpp => sycl_iterator_sort.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_sort_test_stable_sort.pass.cpp => sycl_iterator_stable_sort.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_swap_ranges.pass.cpp => sycl_iterator_swap_ranges.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_transform_binary.pass.cpp => sycl_iterator_transform_binary.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_scan_test_transform_exclusive_scan.pass.cpp => sycl_iterator_transform_exclusive_scan.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_scan_test_transform_inclusive_scan.pass.cpp => sycl_iterator_transform_inclusive_scan.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_reduce_test_transform_reduce_binary.pass.cpp => sycl_iterator_transform_reduce_binary.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_reduce_test_transform_reduce_unary.pass.cpp => sycl_iterator_transform_reduce_unary.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_transform_unary.pass.cpp => sycl_iterator_transform_unary.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_uninitialized_copy.pass.cpp => sycl_iterator_uninitialized_copy.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_uninitialized_copy_n.pass.cpp => sycl_iterator_uninitialized_copy_n.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_uninitialized_default_construct.pass.cpp => sycl_iterator_uninitialized_default_construct.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_uninitialized_default_construct_n.pass.cpp => sycl_iterator_uninitialized_default_construct_n.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_uninitialized_fill.pass.cpp => sycl_iterator_uninitialized_fill.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_uninitialized_fill_n.pass.cpp => sycl_iterator_uninitialized_fill_n.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_uninitialized_move.pass.cpp => sycl_iterator_uninitialized_move.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_uninitialized_move_n.pass.cpp => sycl_iterator_uninitialized_move_n.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_uninitialized_value_construct.pass.cpp => sycl_iterator_uninitialized_value_construct.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_for_test_uninitialized_value_construct_n.pass.cpp => sycl_iterator_uninitialized_value_construct_n.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_scan_test_unique.pass.cpp => sycl_iterator_unique.pass.cpp} (100%)
 rename test/general/sycl_iterator/{sycl_iterator_scan_test_unique_copy.pass.cpp => sycl_iterator_unique_copy.pass.cpp} (100%)

diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_adjacent_difference.pass.cpp b/test/general/sycl_iterator/sycl_iterator_adjacent_difference.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_adjacent_difference.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_adjacent_difference.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_find_test_adjacent_find.pass.cpp b/test/general/sycl_iterator/sycl_iterator_adjacent_find.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_find_test_adjacent_find.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_adjacent_find.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_find_test_any_all_none_of.pass.cpp b/test/general/sycl_iterator/sycl_iterator_any_all_none_of.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_find_test_any_all_none_of.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_any_all_none_of.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_copy.pass.cpp b/test/general/sycl_iterator/sycl_iterator_copy.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_copy.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_copy.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_scan_test_copy_if.pass.cpp b/test/general/sycl_iterator/sycl_iterator_copy_if.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_scan_test_copy_if.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_copy_if.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_copy_n.pass.cpp b/test/general/sycl_iterator/sycl_iterator_copy_n.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_copy_n.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_copy_n.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_reduce_test_count.pass.cpp b/test/general/sycl_iterator/sycl_iterator_count.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_reduce_test_count.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_count.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_reduce_test_count_if.pass.cpp b/test/general/sycl_iterator/sycl_iterator_count_if.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_reduce_test_count_if.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_count_if.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_destroy.pass.cpp b/test/general/sycl_iterator/sycl_iterator_destroy.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_destroy.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_destroy.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_destroy_n.pass.cpp b/test/general/sycl_iterator/sycl_iterator_destroy_n.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_destroy_n.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_destroy_n.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_find_test_equal.pass.cpp b/test/general/sycl_iterator/sycl_iterator_equal.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_find_test_equal.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_equal.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_fill.pass.cpp b/test/general/sycl_iterator/sycl_iterator_fill.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_fill.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_fill.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_fill_n.pass.cpp b/test/general/sycl_iterator/sycl_iterator_fill_n.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_fill_n.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_fill_n.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_find_test_find_end.pass.cpp b/test/general/sycl_iterator/sycl_iterator_find_end.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_find_test_find_end.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_find_end.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_find_test_find_first_of.pass.cpp b/test/general/sycl_iterator/sycl_iterator_find_first_of.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_find_test_find_first_of.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_find_first_of.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_find_test_find_if.pass.cpp b/test/general/sycl_iterator/sycl_iterator_find_if.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_find_test_find_if.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_find_if.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_for_each.pass.cpp b/test/general/sycl_iterator/sycl_iterator_for_each.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_for_each.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_for_each.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_for_each_n.pass.cpp b/test/general/sycl_iterator/sycl_iterator_for_each_n.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_for_each_n.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_for_each_n.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_generate.pass.cpp b/test/general/sycl_iterator/sycl_iterator_generate.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_generate.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_generate.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_generate_n.pass.cpp b/test/general/sycl_iterator/sycl_iterator_generate_n.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_generate_n.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_generate_n.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_includes.pass.cpp b/test/general/sycl_iterator/sycl_iterator_includes.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_includes.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_includes.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_sort_test_inplace_merge.pass.cpp b/test/general/sycl_iterator/sycl_iterator_inplace_merge.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_sort_test_inplace_merge.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_inplace_merge.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_find_test_is_heap.pass.cpp b/test/general/sycl_iterator/sycl_iterator_is_heap.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_find_test_is_heap.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_is_heap.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_find_test_is_heap_until.pass.cpp b/test/general/sycl_iterator/sycl_iterator_is_heap_until.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_find_test_is_heap_until.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_is_heap_until.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_reduce_test_is_partitioned.pass.cpp b/test/general/sycl_iterator/sycl_iterator_is_partitioned.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_reduce_test_is_partitioned.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_is_partitioned.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_find_test_is_sorted.pass.cpp b/test/general/sycl_iterator/sycl_iterator_is_sorted.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_find_test_is_sorted.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_is_sorted.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_find_test_is_sorted_until.pass.cpp b/test/general/sycl_iterator/sycl_iterator_is_sorted_until.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_find_test_is_sorted_until.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_is_sorted_until.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_reduce_test_lexicographical_compare.pass.cpp b/test/general/sycl_iterator/sycl_iterator_lexicographical_compare.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_reduce_test_lexicographical_compare.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_lexicographical_compare.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_reduce_test_max_element.pass.cpp b/test/general/sycl_iterator/sycl_iterator_max_element.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_reduce_test_max_element.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_max_element.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_sort_test_merge.pass.cpp b/test/general/sycl_iterator/sycl_iterator_merge.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_sort_test_merge.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_merge.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_reduce_test_min_element.pass.cpp b/test/general/sycl_iterator/sycl_iterator_min_element.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_reduce_test_min_element.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_min_element.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_reduce_test_minmax_element.pass.cpp b/test/general/sycl_iterator/sycl_iterator_minmax_element.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_reduce_test_minmax_element.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_minmax_element.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_find_test_mismatch.pass.cpp b/test/general/sycl_iterator/sycl_iterator_mismatch.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_find_test_mismatch.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_mismatch.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_move.pass.cpp b/test/general/sycl_iterator/sycl_iterator_move.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_move.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_move.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_sort_test_nth_element.pass.cpp b/test/general/sycl_iterator/sycl_iterator_nth_element.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_sort_test_nth_element.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_nth_element.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_sort_test_partial_sort.pass.cpp b/test/general/sycl_iterator/sycl_iterator_partial_sort.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_sort_test_partial_sort.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_partial_sort.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_sort_test_partial_sort_copy.pass.cpp b/test/general/sycl_iterator/sycl_iterator_partial_sort_copy.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_sort_test_partial_sort_copy.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_partial_sort_copy.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_scan_test_partition.pass.cpp b/test/general/sycl_iterator/sycl_iterator_partition.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_scan_test_partition.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_partition.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_scan_test_partition_copy.pass.cpp b/test/general/sycl_iterator/sycl_iterator_partition_copy.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_scan_test_partition_copy.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_partition_copy.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_reduce_test_reduce.pass.cpp b/test/general/sycl_iterator/sycl_iterator_reduce.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_reduce_test_reduce.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_reduce.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_scan_test_remove.pass.cpp b/test/general/sycl_iterator/sycl_iterator_remove.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_scan_test_remove.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_remove.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_scan_test_remove_if.pass.cpp b/test/general/sycl_iterator/sycl_iterator_remove_if.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_scan_test_remove_if.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_remove_if.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_replace.pass.cpp b/test/general/sycl_iterator/sycl_iterator_replace.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_replace.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_replace.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_replace_copy.pass.cpp b/test/general/sycl_iterator/sycl_iterator_replace_copy.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_replace_copy.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_replace_copy.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_replace_copy_if.pass.cpp b/test/general/sycl_iterator/sycl_iterator_replace_copy_if.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_replace_copy_if.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_replace_copy_if.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_replace_if.pass.cpp b/test/general/sycl_iterator/sycl_iterator_replace_if.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_replace_if.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_replace_if.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_reverse.pass.cpp b/test/general/sycl_iterator/sycl_iterator_reverse.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_reverse.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_reverse.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_reverse_copy.pass.cpp b/test/general/sycl_iterator/sycl_iterator_reverse_copy.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_reverse_copy.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_reverse_copy.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_rotate.pass.cpp b/test/general/sycl_iterator/sycl_iterator_rotate.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_rotate.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_rotate.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_rotate_copy.pass.cpp b/test/general/sycl_iterator/sycl_iterator_rotate_copy.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_rotate_copy.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_rotate_copy.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_find_test_search.pass.cpp b/test/general/sycl_iterator/sycl_iterator_search.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_find_test_search.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_search.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_find_test_search_n.pass.cpp b/test/general/sycl_iterator/sycl_iterator_search_n.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_find_test_search_n.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_search_n.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_scan_test_set_difference.pass.cpp b/test/general/sycl_iterator/sycl_iterator_set_difference.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_scan_test_set_difference.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_set_difference.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_scan_test_set_intersection.pass.cpp b/test/general/sycl_iterator/sycl_iterator_set_intersection.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_scan_test_set_intersection.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_set_intersection.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_scan_test_set_symmetric_difference.pass.cpp b/test/general/sycl_iterator/sycl_iterator_set_symmetric_difference.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_scan_test_set_symmetric_difference.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_set_symmetric_difference.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_scan_test_set_union.pass.cpp b/test/general/sycl_iterator/sycl_iterator_set_union.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_scan_test_set_union.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_set_union.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_sort_test_sort.pass.cpp b/test/general/sycl_iterator/sycl_iterator_sort.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_sort_test_sort.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_sort.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_sort_test_stable_sort.pass.cpp b/test/general/sycl_iterator/sycl_iterator_stable_sort.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_sort_test_stable_sort.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_stable_sort.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_swap_ranges.pass.cpp b/test/general/sycl_iterator/sycl_iterator_swap_ranges.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_swap_ranges.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_swap_ranges.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_transform_binary.pass.cpp b/test/general/sycl_iterator/sycl_iterator_transform_binary.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_transform_binary.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_transform_binary.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_scan_test_transform_exclusive_scan.pass.cpp b/test/general/sycl_iterator/sycl_iterator_transform_exclusive_scan.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_scan_test_transform_exclusive_scan.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_transform_exclusive_scan.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_scan_test_transform_inclusive_scan.pass.cpp b/test/general/sycl_iterator/sycl_iterator_transform_inclusive_scan.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_scan_test_transform_inclusive_scan.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_transform_inclusive_scan.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_reduce_test_transform_reduce_binary.pass.cpp b/test/general/sycl_iterator/sycl_iterator_transform_reduce_binary.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_reduce_test_transform_reduce_binary.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_transform_reduce_binary.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_reduce_test_transform_reduce_unary.pass.cpp b/test/general/sycl_iterator/sycl_iterator_transform_reduce_unary.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_reduce_test_transform_reduce_unary.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_transform_reduce_unary.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_transform_unary.pass.cpp b/test/general/sycl_iterator/sycl_iterator_transform_unary.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_transform_unary.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_transform_unary.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_copy.pass.cpp b/test/general/sycl_iterator/sycl_iterator_uninitialized_copy.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_copy.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_uninitialized_copy.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_copy_n.pass.cpp b/test/general/sycl_iterator/sycl_iterator_uninitialized_copy_n.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_copy_n.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_uninitialized_copy_n.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_default_construct.pass.cpp b/test/general/sycl_iterator/sycl_iterator_uninitialized_default_construct.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_default_construct.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_uninitialized_default_construct.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_default_construct_n.pass.cpp b/test/general/sycl_iterator/sycl_iterator_uninitialized_default_construct_n.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_default_construct_n.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_uninitialized_default_construct_n.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_fill.pass.cpp b/test/general/sycl_iterator/sycl_iterator_uninitialized_fill.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_fill.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_uninitialized_fill.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_fill_n.pass.cpp b/test/general/sycl_iterator/sycl_iterator_uninitialized_fill_n.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_fill_n.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_uninitialized_fill_n.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_move.pass.cpp b/test/general/sycl_iterator/sycl_iterator_uninitialized_move.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_move.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_uninitialized_move.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_move_n.pass.cpp b/test/general/sycl_iterator/sycl_iterator_uninitialized_move_n.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_move_n.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_uninitialized_move_n.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_value_construct.pass.cpp b/test/general/sycl_iterator/sycl_iterator_uninitialized_value_construct.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_value_construct.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_uninitialized_value_construct.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_value_construct_n.pass.cpp b/test/general/sycl_iterator/sycl_iterator_uninitialized_value_construct_n.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_for_test_uninitialized_value_construct_n.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_uninitialized_value_construct_n.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_scan_test_unique.pass.cpp b/test/general/sycl_iterator/sycl_iterator_unique.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_scan_test_unique.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_unique.pass.cpp
diff --git a/test/general/sycl_iterator/sycl_iterator_scan_test_unique_copy.pass.cpp b/test/general/sycl_iterator/sycl_iterator_unique_copy.pass.cpp
similarity index 100%
rename from test/general/sycl_iterator/sycl_iterator_scan_test_unique_copy.pass.cpp
rename to test/general/sycl_iterator/sycl_iterator_unique_copy.pass.cpp