diff --git a/test/input.output/iostreams.base/ios.base/ios.types/ios::Init/tested_elsewhere.pass.cpp b/test/input.output/iostreams.base/ios.base/ios.types/ios_Init/tested_elsewhere.pass.cpp
similarity index 100%
rename from test/input.output/iostreams.base/ios.base/ios.types/ios::Init/tested_elsewhere.pass.cpp
rename to test/input.output/iostreams.base/ios.base/ios.types/ios_Init/tested_elsewhere.pass.cpp
diff --git a/test/input.output/iostreams.base/ios.base/ios.types/ios::failure/ctor_char_pointer_error_code.pass.cpp b/test/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_char_pointer_error_code.pass.cpp
similarity index 100%
rename from test/input.output/iostreams.base/ios.base/ios.types/ios::failure/ctor_char_pointer_error_code.pass.cpp
rename to test/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_char_pointer_error_code.pass.cpp
diff --git a/test/input.output/iostreams.base/ios.base/ios.types/ios::failure/ctor_string_error_code.pass.cpp b/test/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_string_error_code.pass.cpp
similarity index 100%
rename from test/input.output/iostreams.base/ios.base/ios.types/ios::failure/ctor_string_error_code.pass.cpp
rename to test/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_string_error_code.pass.cpp
diff --git a/test/input.output/iostreams.base/ios.base/ios.types/ios::fmtflags/fmtflags.pass.cpp b/test/input.output/iostreams.base/ios.base/ios.types/ios_fmtflags/fmtflags.pass.cpp
similarity index 100%
rename from test/input.output/iostreams.base/ios.base/ios.types/ios::fmtflags/fmtflags.pass.cpp
rename to test/input.output/iostreams.base/ios.base/ios.types/ios_fmtflags/fmtflags.pass.cpp
diff --git a/test/input.output/iostreams.base/ios.base/ios.types/ios::iostate/iostate.pass.cpp b/test/input.output/iostreams.base/ios.base/ios.types/ios_iostate/iostate.pass.cpp
similarity index 100%
rename from test/input.output/iostreams.base/ios.base/ios.types/ios::iostate/iostate.pass.cpp
rename to test/input.output/iostreams.base/ios.base/ios.types/ios_iostate/iostate.pass.cpp
diff --git a/test/input.output/iostreams.base/ios.base/ios.types/ios::openmode/openmode.pass.cpp b/test/input.output/iostreams.base/ios.base/ios.types/ios_openmode/openmode.pass.cpp
similarity index 100%
rename from test/input.output/iostreams.base/ios.base/ios.types/ios::openmode/openmode.pass.cpp
rename to test/input.output/iostreams.base/ios.base/ios.types/ios_openmode/openmode.pass.cpp
diff --git a/test/input.output/iostreams.base/ios.base/ios.types/ios::seekdir/seekdir.pass.cpp b/test/input.output/iostreams.base/ios.base/ios.types/ios_seekdir/seekdir.pass.cpp
similarity index 100%
rename from test/input.output/iostreams.base/ios.base/ios.types/ios::seekdir/seekdir.pass.cpp
rename to test/input.output/iostreams.base/ios.base/ios.types/ios_seekdir/seekdir.pass.cpp