diff --git a/test/strings/basic.string/string.modifiers/string::append/initializer_list.pass.cpp b/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::append/initializer_list.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::append/iterator.pass.cpp b/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::append/iterator.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::append/pointer.pass.cpp b/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::append/pointer.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::append/pointer_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::append/pointer_size.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::append/push_back.pass.cpp b/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::append/push_back.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::append/size_char.pass.cpp b/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::append/size_char.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::append/string.pass.cpp b/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::append/string.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_append/string.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::append/string_size_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::append/string_size_size.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::assign/initializer_list.pass.cpp b/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::assign/initializer_list.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::assign/iterator.pass.cpp b/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::assign/iterator.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::assign/pointer.pass.cpp b/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::assign/pointer.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::assign/pointer_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::assign/pointer_size.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::assign/rv_string.pass.cpp b/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::assign/rv_string.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::assign/size_char.pass.cpp b/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::assign/size_char.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::assign/string.pass.cpp b/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::assign/string.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::assign/string_size_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::assign/string_size_size.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::copy/copy.pass.cpp b/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::copy/copy.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::erase/iter.pass.cpp b/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::erase/iter.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::erase/iter_iter.pass.cpp b/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::erase/iter_iter.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::erase/pop_back.pass.cpp b/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::erase/pop_back.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::erase/size_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::erase/size_size.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::insert/iter_char.pass.cpp b/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::insert/iter_char.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::insert/iter_initializer_list.pass.cpp b/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::insert/iter_initializer_list.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::insert/iter_iter_iter.pass.cpp b/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::insert/iter_iter_iter.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::insert/iter_size_char.pass.cpp b/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::insert/iter_size_char.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::insert/size_pointer.pass.cpp b/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::insert/size_pointer.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::insert/size_pointer_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::insert/size_pointer_size.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::insert/size_size_char.pass.cpp b/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::insert/size_size_char.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::insert/size_string.pass.cpp b/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::insert/size_string.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::insert/size_string_size_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::insert/size_string_size_size.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::op+=/char.pass.cpp b/test/strings/basic.string/string.modifiers/string_op+=/char.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::op+=/char.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_op+=/char.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::op+=/initializer_list.pass.cpp b/test/strings/basic.string/string.modifiers/string_op+=/initializer_list.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::op+=/initializer_list.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_op+=/initializer_list.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::op+=/pointer.pass.cpp b/test/strings/basic.string/string.modifiers/string_op+=/pointer.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::op+=/pointer.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_op+=/pointer.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::op+=/string.pass.cpp b/test/strings/basic.string/string.modifiers/string_op+=/string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::op+=/string.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_op+=/string.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::replace/iter_iter_initializer_list.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::replace/iter_iter_initializer_list.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::replace/iter_iter_iter_iter.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::replace/iter_iter_iter_iter.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::replace/iter_iter_pointer.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::replace/iter_iter_pointer.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::replace/iter_iter_pointer_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::replace/iter_iter_pointer_size.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::replace/iter_iter_size_char.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::replace/iter_iter_size_char.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::replace/iter_iter_string.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::replace/iter_iter_string.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::replace/size_size_pointer.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::replace/size_size_pointer.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::replace/size_size_pointer_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::replace/size_size_pointer_size.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::replace/size_size_size_char.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::replace/size_size_size_char.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::replace/size_size_string.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::replace/size_size_string.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::replace/size_size_string_size_size.pass.cpp b/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::replace/size_size_string_size_size.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp
diff --git a/test/strings/basic.string/string.modifiers/string::swap/swap.pass.cpp b/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.modifiers/string::swap/swap.pass.cpp
rename to test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::compare/pointer.pass.cpp b/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::compare/pointer.pass.cpp
rename to test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::compare/size_size_pointer.pass.cpp b/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::compare/size_size_pointer.pass.cpp
rename to test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::compare/size_size_pointer_size.pass.cpp b/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::compare/size_size_pointer_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::compare/size_size_string.pass.cpp b/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::compare/size_size_string.pass.cpp
rename to test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::compare/size_size_string_size_size.pass.cpp b/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::compare/size_size_string_size_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::compare/string.pass.cpp b/test/strings/basic.string/string.ops/string_compare/string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::compare/string.pass.cpp
rename to test/strings/basic.string/string.ops/string_compare/string.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find.first.not.of/char_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find.first.not.of/char_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find.first.not.of/pointer_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find.first.not.of/pointer_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find.first.not.of/pointer_size_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find.first.not.of/pointer_size_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find.first.not.of/string_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find.first.not.of/string_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find.first.of/char_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find.first.of/char_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find.first.of/pointer_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find.first.of/pointer_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find.first.of/pointer_size_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find.first.of/pointer_size_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find.first.of/string_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find.first.of/string_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find.last.not.of/char_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find.last.not.of/char_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find.last.not.of/pointer_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find.last.not.of/pointer_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find.last.not.of/pointer_size_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find.last.not.of/pointer_size_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find.last.not.of/string_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find.last.not.of/string_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find.last.of/char_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find.last.of/char_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find.last.of/pointer_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find.last.of/pointer_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find.last.of/pointer_size_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find.last.of/pointer_size_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find.last.of/string_size.pass.cpp b/test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find.last.of/string_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find/char_size.pass.cpp b/test/strings/basic.string/string.ops/string_find/char_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find/char_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find/char_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find/pointer_size.pass.cpp b/test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find/pointer_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find/pointer_size_size.pass.cpp b/test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find/pointer_size_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::find/string_size.pass.cpp b/test/strings/basic.string/string.ops/string_find/string_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::find/string_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_find/string_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::rfind/char_size.pass.cpp b/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::rfind/char_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::rfind/pointer_size.pass.cpp b/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::rfind/pointer_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::rfind/pointer_size_size.pass.cpp b/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::rfind/pointer_size_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::rfind/string_size.pass.cpp b/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::rfind/string_size.pass.cpp
rename to test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp
diff --git a/test/strings/basic.string/string.ops/string::substr/substr.pass.cpp b/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.ops/string::substr/substr.pass.cpp
rename to test/strings/basic.string/string.ops/string_substr/substr.pass.cpp