diff --git a/test/strings/basic.string/string.nonmembers/string::op!=/pointer_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::op!=/pointer_string.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_op!=/pointer_string.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::op!=/string_pointer.pass.cpp b/test/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::op!=/string_pointer.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_op!=/string_pointer.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::op!=/string_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::op!=/string_string.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_op!=/string_string.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::op+/char_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::op+/char_string.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::op+/pointer_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::op+/pointer_string.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::op+/string_char.pass.cpp b/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::op+/string_char.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::op+/string_pointer.pass.cpp b/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::op+/string_pointer.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::op+/string_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::op+/string_string.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::operator==/pointer_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::operator==/pointer_string.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::operator==/string_pointer.pass.cpp b/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::operator==/string_pointer.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::operator==/string_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::operator==/string_string.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::opgt/pointer_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::opgt/pointer_string.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::opgt/string_pointer.pass.cpp b/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::opgt/string_pointer.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::opgt/string_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::opgt/string_string.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::opgt=/pointer_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::opgt=/pointer_string.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::opgt=/string_pointer.pass.cpp b/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::opgt=/string_pointer.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::opgt=/string_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::opgt=/string_string.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::oplt/pointer_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::oplt/pointer_string.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::oplt/string_pointer.pass.cpp b/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::oplt/string_pointer.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::oplt/string_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::oplt/string_string.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::oplt=/pointer_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::oplt=/pointer_string.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::oplt=/string_pointer.pass.cpp b/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::oplt=/string_pointer.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
diff --git a/test/strings/basic.string/string.nonmembers/string::oplt=/string_string.pass.cpp b/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
similarity index 100%
rename from test/strings/basic.string/string.nonmembers/string::oplt=/string_string.pass.cpp
rename to test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp