diff --git a/libcxx/test/std/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/lwg3629.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/lwg3629.pass.cpp
--- a/libcxx/test/std/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/lwg3629.pass.cpp
+++ b/libcxx/test/std/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/lwg3629.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <type_traits>
 
-namespace user {
+namespace User {
   enum Err {};
 
   std::error_code make_error_code(Err) { return std::error_code(42, std::generic_category()); }
@@ -28,11 +28,11 @@
 
 namespace std {
   template <>
-  struct is_error_code_enum<user::Err> : true_type {};
+  struct is_error_code_enum<User::Err> : true_type {};
 }
 
 int main(int, char**) {
-  std::error_code e((user::Err()));
+  std::error_code e((User::Err()));
   assert(e.value() == 42);
   assert(e.category() == std::generic_category());
 
diff --git a/libcxx/test/std/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/lwg3629.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/lwg3629.pass.cpp
--- a/libcxx/test/std/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/lwg3629.pass.cpp
+++ b/libcxx/test/std/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/lwg3629.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <type_traits>
 
-namespace user {
+namespace User {
   enum Err {};
 
   std::error_code make_error_code(Err) { return std::error_code(42, std::generic_category()); }
@@ -28,12 +28,12 @@
 
 namespace std {
   template <>
-  struct is_error_code_enum<user::Err> : true_type {};
+  struct is_error_code_enum<User::Err> : true_type {};
 }
 
 int main(int, char**) {
   std::error_code e;
-  e = user::Err();
+  e = User::Err();
   assert(e.value() == 42);
   assert(e.category() == std::generic_category());
 
diff --git a/libcxx/test/std/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/lwg3629.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/lwg3629.pass.cpp
--- a/libcxx/test/std/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/lwg3629.pass.cpp
+++ b/libcxx/test/std/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/lwg3629.pass.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <type_traits>
 
-namespace user {
+namespace User {
   enum Err {};
 
   std::error_condition make_error_condition(Err) { return std::error_condition(42, std::generic_category()); }
@@ -28,11 +28,11 @@
 
 namespace std {
   template <>
-  struct is_error_condition_enum<user::Err> : true_type {};
+  struct is_error_condition_enum<User::Err> : true_type {};
 }
 
 int main(int, char**) {
-  std::error_condition e((user::Err()));
+  std::error_condition e((User::Err()));
   assert(e.value() == 42);
   assert(e.category() == std::generic_category());
 
diff --git a/libcxx/test/std/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/lwg3629.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/lwg3629.pass.cpp
--- a/libcxx/test/std/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/lwg3629.pass.cpp
+++ b/libcxx/test/std/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/lwg3629.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "test_macros.h"
 
-namespace user {
+namespace User {
   enum Err {};
 
   std::error_condition make_error_condition(Err) { return std::error_condition(42, std::generic_category()); }
@@ -30,12 +30,12 @@
 
 namespace std {
   template <>
-  struct is_error_condition_enum<user::Err> : true_type {};
+  struct is_error_condition_enum<User::Err> : true_type {};
 }
 
 int main(int, char**) {
   std::error_condition e;
-  e = user::Err();
+  e = User::Err();
   assert(e.value() == 42);
   assert(e.category() == std::generic_category());
   return 0;