Index: include/charconv
===================================================================
--- include/charconv
+++ include/charconv
@@ -470,11 +470,11 @@
 __subject_seq_combinator(_It __first, _It __last, _Tp& __value, _Fn __f,
                          _Ts... __args)
 {
-    auto __find_non_zero = [](_It __first, _It __last) {
-        for (; __first != __last; ++__first)
-            if (*__first != '0')
+    auto __find_non_zero = [](_It __firstx, _It __lastx) {
+        for (; __firstx != __lastx; ++__firstx)
+            if (*__firstx != '0')
                 break;
-        return __first;
+        return __firstx;
     };
 
     auto __p = __find_non_zero(__first, __last);
@@ -511,16 +511,16 @@
 
     return __subject_seq_combinator(
         __first, __last, __value,
-        [](const char* __first, const char* __last,
-           _Tp& __value) -> from_chars_result {
+        [](const char* __firstx, const char* __lastx,
+           _Tp& __valuex) -> from_chars_result {
             __output_type __a, __b;
-            auto __p = __tx::__read(__first, __last, __a, __b);
-            if (__p == __last || !__in_pattern(*__p))
+            auto __p = __tx::__read(__firstx, __lastx, __a, __b);
+            if (__p == __lastx || !__in_pattern(*__p))
             {
                 __output_type __m = (numeric_limits<_Tp>::max)();
                 if (__m >= __a && __m - __a >= __b)
                 {
-                    __value = __a + __b;
+                    __valuex = __a + __b;
                     return {__p, {}};
                 }
             }
@@ -546,21 +546,21 @@
 
     return __subject_seq_combinator(
         __first, __last, __value,
-        [](const char* __p, const char* __last, _Tp& __value,
-           int __base) -> from_chars_result {
+        [](const char* __p, const char* __lastx, _Tp& __valuex,
+           int __basex) -> from_chars_result {
             using __tl = numeric_limits<_Tp>;
-            auto __digits = __tl::digits / log2f(float(__base));
-            _Tp __a = __in_pattern(*__p++, __base).__val, __b = 0;
+            auto __digits = __tl::digits / log2f(float(__basex));
+            _Tp __a = __in_pattern(*__p++, __basex).__val, __b = 0;
 
-            for (int __i = 1; __p != __last; ++__i, ++__p)
+            for (int __i = 1; __p != __lastx; ++__i, ++__p)
             {
-                if (auto __c = __in_pattern(*__p, __base))
+                if (auto __c = __in_pattern(*__p, __basex))
                 {
                     if (__i < __digits - 1)
-                        __a = __a * __base + __c.__val;
+                        __a = __a * __basex + __c.__val;
                     else
                     {
-                        if (!__itoa::__mul_overflowed(__a, __base, __a))
+                        if (!__itoa::__mul_overflowed(__a, __basex, __a))
                             ++__p;
                         __b = __c.__val;
                         break;
@@ -570,11 +570,11 @@
                     break;
             }
 
-            if (__p == __last || !__in_pattern(*__p, __base))
+            if (__p == __lastx || !__in_pattern(*__p, __basex))
             {
                 if ((__tl::max)() - __a >= __b)
                 {
-                    __value = __a + __b;
+                    __valuex = __a + __b;
                     return {__p, {}};
                 }
             }
Index: test/support/filesystem_test_helper.hpp
===================================================================
--- test/support/filesystem_test_helper.hpp
+++ test/support/filesystem_test_helper.hpp
@@ -452,19 +452,19 @@
   const char* func_name;
   std::string opt_message;
 
-  explicit ExceptionChecker(std::errc first_err, const char* func_name,
+  explicit ExceptionChecker(std::errc first_err, const char* pfunc_name,
                             std::string opt_msg = {})
-      : expected_err{first_err}, num_paths(0), func_name(func_name),
+      : expected_err{first_err}, num_paths(0), func_name(pfunc_name),
         opt_message(opt_msg) {}
   explicit ExceptionChecker(fs::path p, std::errc first_err,
-                            const char* func_name, std::string opt_msg = {})
+                            const char* pfunc_name, std::string opt_msg = {})
       : expected_err(first_err), expected_path1(p), num_paths(1),
-        func_name(func_name), opt_message(opt_msg) {}
+        func_name(pfunc_name), opt_message(opt_msg) {}
 
   explicit ExceptionChecker(fs::path p1, fs::path p2, std::errc first_err,
-                            const char* func_name, std::string opt_msg = {})
+                            const char* pfunc_name, std::string opt_msg = {})
       : expected_err(first_err), expected_path1(p1), expected_path2(p2),
-        num_paths(2), func_name(func_name), opt_message(opt_msg) {}
+        num_paths(2), func_name(pfunc_name), opt_message(opt_msg) {}
 
   void operator()(fs::filesystem_error const& Err) {
     TEST_CHECK(ErrorIsImp(Err.code(), {expected_err}));