diff --git a/libcxx/include/__ranges/concat_view.h b/libcxx/include/__ranges/concat_view.h
index f5f9add0d835fe5..881e5fb31ea7a0f 100644
--- a/libcxx/include/__ranges/concat_view.h
+++ b/libcxx/include/__ranges/concat_view.h
@@ -127,8 +127,9 @@ concept concatable = requires { // exposition only
 
 template <bool Const, class... Rs>
 concept concat_is_random_access = 
-   (all_random_access<Const, Rs...>) &&
-   (sized_range<maybe_const<Const, Rs>> && ...);
+   (random_access_range<__maybe_const<_Const, _Rs>> && ...)
+   &&
+   (sized_range<__maybe_const<Const, Rs>> && ...);
 
 template <class R>
 concept constant_time_reversible =          // exposition only
@@ -138,9 +139,9 @@ concept constant_time_reversible =          // exposition only
 template <bool Const, class... Rs>
 concept concat_is_bidirectional = 
     (
-     (bidirectional_range<maybe_const<Const, Rs>> && ... )
+     (bidirectional_range<__maybe_const<Const, Rs>> && ... )
      && 
-     (constant_time_reversible<maybe_const<Const, Rs>> && ... )
+     (constant_time_reversible<__maybe_const<Const, Rs>> && ... )
     );
 
 
@@ -161,7 +162,7 @@ class concat_view : public view_interface<concat_view<Views...>>
 
     constexpr explicit concat_view(Views... views): views_(views...) {}
 
-    constexpr iterator<false> begin() requires(!(simple_view<Views> && ...))
+    constexpr iterator<false> begin() requires(!(__simple_view<Views> && ...))
     {
         iterator<false> it(this, in_place_index<0>, ranges::begin(get<0>(views_)));
         it.template satisfy<0>();
@@ -176,7 +177,7 @@ class concat_view : public view_interface<concat_view<Views...>>
         return it;
     }
 
-    constexpr auto end() requires(!(simple_view<Views> && ...))
+    constexpr auto end() requires(!(__simple_view<Views> && ...))
     {
         if constexpr (common_range<typename last_view<Views...>::type>) {
             // last_view to be implemented 
@@ -234,9 +235,9 @@ template <input_range... Views>
   public:
     //using iterator_category = see below;                  // not always present.
 
-    using derive_pack_random_iterator = derived_from_pack<iterator_traits<iterator_t<__maybe_const<Const, Views>>>::iterator_category..., random_access_iterator_tag>::value; 
-    using derive_pack_bidirectional_iterator = derived_from_pack<iterator_traits<iterator_t<__maybe_const<Const, Views>>>::iterator_category..., bidirectional_iterator_tag>::value; 
-    using derive_pack_forward_iterator = derived_from_pack<iterator_traits<iterator_t<__maybe_const<Const, Views>>>::iterator_category..., forward_iterator_tag>::value; 
+    using derive_pack_random_iterator = derived_from_pack<iterator_traits<typename iterator_t<__maybe_const<Const, Views>>>::iterator_category..., random_access_iterator_tag>::value; 
+    using derive_pack_bidirectional_iterator = derived_from_pack<iterator_traits<typename iterator_t<__maybe_const<Const, Views>>>::iterator_category..., bidirectional_iterator_tag>::value; 
+    using derive_pack_forward_iterator = derived_from_pack<iterator_traits<typename iterator_t<__maybe_const<Const, Views>>>::iterator_category..., forward_iterator_tag>::value; 
     using iterator_concept = _If<!is_reference_v<concat_reference_t<__maybe_const<Const, Views>...>>,
                                 input_iterator_tag,
                                 _If<derive_pack_random_iterator,