Index: include/pstl/internal/algorithm_impl.h
===================================================================
--- include/pstl/internal/algorithm_impl.h
+++ include/pstl/internal/algorithm_impl.h
@@ -64,7 +64,7 @@
 __pattern_any_of(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Pred __pred,
                  _IsVector __is_vector, /*parallel=*/std::true_type)
 {
-    return internal::except_handler([&]() {
+    return internal::__except_handler([&]() {
         return internal::parallel_or(std::forward<_ExecutionPolicy>(__exec), __first, __last,
                                      [__pred, __is_vector](_ForwardIterator __i, _ForwardIterator __j) {
                                          return internal::__brick_any_of(__i, __j, __pred, __is_vector);
@@ -121,7 +121,7 @@
                 _IsVector __is_vector,
                 /*parallel=*/std::true_type)
 {
-    internal::except_handler([&]() {
+    internal::__except_handler([&]() {
         par_backend::parallel_for(std::forward<_ExecutionPolicy>(__exec), __first, __last,
                                   [__f, __is_vector](_ForwardIterator __i, _ForwardIterator __j) {
                                       internal::__brick_walk1(__i, __j, __f, __is_vector);
@@ -144,7 +144,7 @@
 __pattern_walk_brick(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Brick __brick,
                      /*parallel=*/std::true_type)
 {
-    internal::except_handler([&]() {
+    internal::__except_handler([&]() {
         par_backend::parallel_for(std::forward<_ExecutionPolicy>(__exec), __first, __last,
                                   [__brick](_ForwardIterator __i, _ForwardIterator __j) { __brick(__i, __j); });
     });
@@ -204,7 +204,7 @@
 __pattern_walk_brick_n(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _Size __n, _Brick __brick,
                        /*is_parallel=*/std::true_type)
 {
-    return internal::except_handler([&]() {
+    return internal::__except_handler([&]() {
         par_backend::parallel_for(
             std::forward<_ExecutionPolicy>(__exec), __first, __first + __n,
             [__brick](_RandomAccessIterator __i, _RandomAccessIterator __j) { __brick(__i, __j - __i); });
@@ -268,7 +268,7 @@
 __pattern_walk2(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1,
                 _ForwardIterator2 __first2, _Function __f, _IsVector __is_vector, /*parallel=*/std::true_type)
 {
-    return internal::except_handler([&]() {
+    return internal::__except_handler([&]() {
         par_backend::parallel_for(std::forward<_ExecutionPolicy>(__exec), __first1, __last1,
                                   [__f, __first1, __first2, __is_vector](_ForwardIterator1 __i, _ForwardIterator1 __j) {
                                       internal::__brick_walk2(__i, __j, __first2 + (__i - __first1), __f, __is_vector);
@@ -311,7 +311,7 @@
 __pattern_walk2_brick(_ExecutionPolicy&& __exec, _RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1,
                       _RandomAccessIterator2 __first2, _Brick __brick, /*parallel=*/std::true_type)
 {
-    return except_handler([&]() {
+    return __except_handler([&]() {
         par_backend::parallel_for(
             std::forward<_ExecutionPolicy>(__exec), __first1, __last1,
             [__first1, __first2, __brick](_RandomAccessIterator1 __i, _RandomAccessIterator1 __j) {
@@ -328,7 +328,7 @@
 __pattern_walk2_brick_n(_ExecutionPolicy&& __exec, _RandomAccessIterator1 __first1, _Size __n,
                         _RandomAccessIterator2 __first2, _Brick __brick, /*parallel=*/std::true_type)
 {
-    return except_handler([&]() {
+    return __except_handler([&]() {
         par_backend::parallel_for(
             std::forward<_ExecutionPolicy>(__exec), __first1, __first1 + __n,
             [__first1, __first2, __brick](_RandomAccessIterator1 __i, _RandomAccessIterator1 __j) {
@@ -387,7 +387,7 @@
                 _RandomAccessIterator2 __first2, _RandomAccessIterator3 __first3, _Function __f, _IsVector __is_vector,
                 /*parallel=*/std::true_type)
 {
-    return internal::except_handler([&]() {
+    return internal::__except_handler([&]() {
         par_backend::parallel_for(
             std::forward<_ExecutionPolicy>(__exec), __first1, __last1,
             [__f, __first1, __first2, __first3, __is_vector](_RandomAccessIterator1 __i, _RandomAccessIterator1 __j) {
@@ -416,7 +416,7 @@
 __brick_equal(_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1, _RandomAccessIterator2 __first2,
               _BinaryPredicate __p, /* is_vector = */ std::true_type) noexcept
 {
-    return unseq_backend::simd_first(__first1, __last1 - __first1, __first2, not_pred<_BinaryPredicate>(__p)).first ==
+    return unseq_backend::simd_first(__first1, __last1 - __first1, __first2, __not_pred<_BinaryPredicate>(__p)).first ==
            __last1;
 }
 
@@ -437,7 +437,7 @@
                 _RandomAccessIterator2 __first2, _BinaryPredicate __p, _IsVector __is_vector,
                 /*is_parallel=*/std::true_type)
 {
-    return internal::except_handler([&]() {
+    return internal::__except_handler([&]() {
         return !internal::parallel_or(
             std::forward<_ExecutionPolicy>(__exec), __first1, __last1,
             [__first1, __first2, __p, __is_vector](_RandomAccessIterator1 __i, _RandomAccessIterator1 __j) {
@@ -485,7 +485,7 @@
                   _IsVector __is_vector,
                   /*is_parallel=*/std::true_type)
 {
-    return internal::except_handler([&]() {
+    return internal::__except_handler([&]() {
         return internal::parallel_find(std::forward<_ExecutionPolicy>(__exec), __first, __last,
                                        [__pred, __is_vector](_ForwardIterator __i, _ForwardIterator __j) {
                                            return internal::__brick_find_if(__i, __j, __pred, __is_vector);
@@ -527,7 +527,7 @@
     {
         // find position of *s_first in [first, last) (it can be start of subsequence)
         __first = internal::__brick_find_if(
-            __first, __last, internal::equal_value_by_pred<_ValueType, _BinaryPredicate>(*__s_first, __pred),
+            __first, __last, internal::__equal_value_by_pred<_ValueType, _BinaryPredicate>(*__s_first, __pred),
             __is_vector);
 
         // if position that was found previously is the start of subsequence
@@ -571,7 +571,7 @@
     }
 
     auto __n = __global_last - __first;
-    auto __unary_pred = internal::equal_value_by_pred<_Tp, _BinaryPredicate>(__value, __pred);
+    auto __unary_pred = internal::__equal_value_by_pred<_Tp, _BinaryPredicate>(__value, __pred);
     while (__first != __last && (__global_last - __first >= __count))
     {
         __first = __brick_find_if(__first, __last, __unary_pred, __is_vector);
@@ -579,7 +579,7 @@
         // check that all of elements in [first+1, first+count) equal to value
         if (__first != __last && (__global_last - __first >= __count) &&
             !internal::__brick_any_of(__first + 1, __first + __count,
-                                      internal::not_pred<decltype(__unary_pred)>(__unary_pred), __is_vector))
+                                      internal::__not_pred<decltype(__unary_pred)>(__unary_pred), __is_vector))
         {
             return __first;
         }
@@ -637,7 +637,7 @@
     }
     else
     {
-        return except_handler([&]() {
+        return __except_handler([&]() {
             return internal::parallel_find(
                 std::forward<_ExecutionPolicy>(__exec), __first, __last,
                 [__last, __s_first, __s_last, __pred, __is_vector](_ForwardIterator1 __i, _ForwardIterator1 __j) {
@@ -686,7 +686,7 @@
                         _ForwardIterator2 __s_first, _ForwardIterator2 __s_last, _BinaryPredicate __pred,
                         _IsVector __is_vector, /*is_parallel=*/std::true_type) noexcept
 {
-    return except_handler([&]() {
+    return __except_handler([&]() {
         return internal::parallel_find(
             std::forward<_ExecutionPolicy>(__exec), __first, __last,
             [__s_first, __s_last, __pred, __is_vector](_ForwardIterator1 __i, _ForwardIterator1 __j) {
@@ -743,7 +743,7 @@
     }
     else
     {
-        return except_handler([&]() {
+        return __except_handler([&]() {
             return internal::parallel_find(
                 std::forward<_ExecutionPolicy>(__exec), __first, __last,
                 [__last, __s_first, __s_last, __pred, __is_vector](_ForwardIterator1 __i, _ForwardIterator1 __j) {
@@ -802,7 +802,7 @@
     }
     else
     {
-        return except_handler([&__exec, __first, __last, __count, &__value, __pred, __is_vector]() {
+        return __except_handler([&__exec, __first, __last, __count, &__value, __pred, __is_vector]() {
             return internal::parallel_find(
                 std::forward<_ExecutionPolicy>(__exec), __first, __last,
                 [__last, __count, &__value, __pred, __is_vector](_RandomAccessIterator __i, _RandomAccessIterator __j) {
@@ -1030,7 +1030,7 @@
     if (_DifferenceType(1) < __n)
     {
         par_backend::buffer<bool> __mask_buf(__n);
-        return except_handler([&__exec, __n, __first, __result, __is_vector, __pred, &__mask_buf]() {
+        return __except_handler([&__exec, __n, __first, __result, __is_vector, __pred, &__mask_buf]() {
             bool* __mask = __mask_buf.get();
             _DifferenceType __m{};
             par_backend::parallel_strict_scan(
@@ -1089,7 +1089,7 @@
                 /* is_parallel */ std::true_type, _IsVector __is_vector)
 {
     typedef typename std::iterator_traits<_ForwardIterator>::difference_type _SizeType;
-    return except_handler([&]() {
+    return __except_handler([&]() {
         return par_backend::parallel_reduce(
             std::forward<_ExecutionPolicy>(__exec), __first, __last, _SizeType(0),
             [__pred, __is_vector](_ForwardIterator __begin, _ForwardIterator __end, _SizeType __value) -> _SizeType {
@@ -1142,7 +1142,7 @@
     _DifferenceType __n = __last - __first;
     par_backend::buffer<bool> __mask_buf(__n);
     // 1. find a first iterator that should be removed
-    return except_handler([&]() {
+    return __except_handler([&]() {
         bool* __mask = __mask_buf.get();
         _DifferenceType __min = par_backend::parallel_reduce(
             std::forward<_ExecutionPolicy>(__exec), _DifferenceType(0), __n, __n,
@@ -1191,8 +1191,8 @@
             [=](_DifferenceType __i, _DifferenceType __len, _DifferenceType __initial) {
                 __brick_copy_by_mask(__first + __i, __first + __i + __len, __result + __initial, __mask + __i,
                                      [](_ForwardIterator __x, _Tp* __z) {
-                                         invoke_if_else(std::is_trivial<_Tp>(), [&]() { *__z = std::move(*__x); },
-                                                        [&]() { ::new (std::addressof(*__z)) _Tp(std::move(*__x)); });
+                                         __invoke_if_else(std::is_trivial<_Tp>(), [&]() { *__z = std::move(*__x); },
+                                                          [&]() { ::new (std::addressof(*__z)) _Tp(std::move(*__x)); });
                                      },
                                      __is_vector);
             },
@@ -1306,7 +1306,7 @@
         par_backend::buffer<bool> __mask_buf(__n);
         if (_DifferenceType(2) < __n)
         {
-            return internal::except_handler([&__exec, __n, __first, __result, __pred, __is_vector, &__mask_buf]() {
+            return internal::__except_handler([&__exec, __n, __first, __result, __pred, __is_vector, &__mask_buf]() {
                 bool* __mask = __mask_buf.get();
                 _DifferenceType __m{};
                 par_backend::parallel_strict_scan(
@@ -1543,7 +1543,7 @@
     if (__m <= __n / 2)
     {
         par_backend::buffer<_Tp> __buf(__n - __m);
-        return except_handler([&__exec, __n, __m, __first, __middle, __last, __is_vector, &__buf]() {
+        return __except_handler([&__exec, __n, __m, __first, __middle, __last, __is_vector, &__buf]() {
             _Tp* __result = __buf.get();
             par_backend::parallel_for(std::forward<_ExecutionPolicy>(__exec), __middle, __last,
                                       [__middle, __result, __is_vector](_ForwardIterator __b, _ForwardIterator __e) {
@@ -1567,7 +1567,7 @@
     else
     {
         par_backend::buffer<_Tp> __buf(__m);
-        return except_handler([&__exec, __n, __m, __first, __middle, __last, __is_vector, &__buf]() {
+        return __except_handler([&__exec, __n, __m, __first, __middle, __last, __is_vector, &__buf]() {
             _Tp* __result = __buf.get();
             par_backend::parallel_for(std::forward<_ExecutionPolicy>(__exec), __first, __middle,
                                       [__first, __result, __is_vector](_ForwardIterator __b, _ForwardIterator __e) {
@@ -1711,7 +1711,7 @@
     }
     else
     {
-        return except_handler([&]() {
+        return __except_handler([&]() {
             // State of current range:
             // broken     - current range is not partitioned by pred
             // all_true   - all elements in current range satisfy pred
@@ -1747,7 +1747,8 @@
                     {
                         // find first element that don't satisfy pred
                         _ForwardIterator __x =
-                            __brick_find_if(__i + 1, __j, not_pred<_UnaryPredicate>(__pred), __is_vector);
+                            __brick_find_if(__i + 1, __j, __not_pred<_UnaryPredicate>(__pred), __is_vector);
+			
                         if (__x != __j)
                         {
                             // find first element after "x" that satisfy pred
@@ -1843,7 +1844,7 @@
         _ForwardIterator __end;
     };
 
-    return except_handler([&]() {
+    return __except_handler([&]() {
         _PartitionRange __init{__last, __last, __last};
 
         // lambda for merging two partitioned ranges to one partitioned range
@@ -1943,7 +1944,7 @@
         _BidirectionalIterator __end;
     };
 
-    return except_handler([&]() {
+    return __except_handler([&]() {
         _PartitionRange __init{__last, __last, __last};
 
         // lambda for merging two partitioned ranges to one partitioned range
@@ -2029,7 +2030,7 @@
     if (_DifferenceType(1) < __n)
     {
         par_backend::buffer<bool> __mask_buf(__n);
-        return internal::except_handler(
+        return internal::__except_handler(
             [&__exec, __n, __first, __out_true, __out_false, __is_vector, __pred, &__mask_buf]() {
                 bool* __mask = __mask_buf.get();
                 _ReturnType __m{};
@@ -2075,7 +2076,7 @@
 __pattern_sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp,
                _IsVector /*is_vector*/, /*is_parallel=*/std::true_type, /*is_move_constructible=*/std::true_type)
 {
-    except_handler([&]() {
+    __except_handler([&]() {
         par_backend::parallel_stable_sort(std::forward<_ExecutionPolicy>(__exec), __first, __last, __comp,
                                           [](_RandomAccessIterator __first, _RandomAccessIterator __last,
                                              _Compare __comp) { std::sort(__first, __last, __comp); },
@@ -2102,7 +2103,7 @@
 __pattern_stable_sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last,
                       _Compare __comp, _IsVector /*is_vector*/, /*is_parallel=*/std::true_type)
 {
-    internal::except_handler([&]() {
+    internal::__except_handler([&]() {
         par_backend::parallel_stable_sort(std::forward<_ExecutionPolicy>(__exec), __first, __last, __comp,
                                           [](_RandomAccessIterator __first, _RandomAccessIterator __last,
                                              _Compare __comp) { std::stable_sort(__first, __last, __comp); });
@@ -2130,7 +2131,7 @@
                        _RandomAccessIterator __last, _Compare __comp, _IsVector, /*is_parallel=*/std::true_type)
 {
     const auto __n = __middle - __first;
-    except_handler([&]() {
+    __except_handler([&]() {
         par_backend::parallel_stable_sort(
             std::forward<_ExecutionPolicy>(__exec), __first, __last, __comp,
             [__n](_RandomAccessIterator __begin, _RandomAccessIterator __end, _Compare __comp) {
@@ -2170,7 +2171,7 @@
     }
     auto __n1 = __last - __first;
     auto __n2 = __d_last - __d_first;
-    return except_handler([&]() {
+    return __except_handler([&]() {
         if (__n2 >= __n1)
         {
             par_backend::parallel_stable_sort(
@@ -2265,7 +2266,7 @@
     if (__last - __first < 2)
         return __last;
 
-    return internal::except_handler([&]() {
+    return internal::__except_handler([&]() {
         return par_backend::parallel_reduce(
             std::forward<_ExecutionPolicy>(__exec), __first, __last, __last,
             [__last, __pred, __is_vector, __or_semantic](_RandomAccessIterator __begin, _RandomAccessIterator __end,
@@ -2397,7 +2398,7 @@
 __pattern_fill(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, const _Tp& __value,
                /*is_parallel=*/std::true_type, _IsVector __is_vector)
 {
-    return except_handler([&__exec, __first, __last, &__value, __is_vector]() {
+    return __except_handler([&__exec, __first, __last, &__value, __is_vector]() {
         par_backend::parallel_for(std::forward<_ExecutionPolicy>(__exec), __first, __last,
                                   [&__value, __is_vector](_ForwardIterator __begin, _ForwardIterator __end) {
                                       internal::__brick_fill(__begin, __end, __value, __is_vector);
@@ -2471,7 +2472,7 @@
 __pattern_generate(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Generator __g,
                    /*is_parallel=*/std::true_type, _IsVector __is_vector)
 {
-    return internal::except_handler([&]() {
+    return internal::__except_handler([&]() {
         par_backend::parallel_for(std::forward<_ExecutionPolicy>(__exec), __first, __last,
                                   [__g, __is_vector](_ForwardIterator __begin, _ForwardIterator __end) {
                                       internal::__brick_generate(__begin, __end, __g, __is_vector);
@@ -2666,10 +2667,10 @@
     auto __n = __last - __first;
     par_backend::buffer<_Tp> __buf(__n);
     _Tp* __r = __buf.get();
-    except_handler([&]() {
+    __except_handler([&]() {
         auto __move_values = [](_BidirectionalIterator __x, _Tp* __z) {
-            invoke_if_else(std::is_trivial<_Tp>(), [&]() { *__z = std::move(*__x); },
-                           [&]() { ::new (std::addressof(*__z)) _Tp(std::move(*__x)); });
+            __invoke_if_else(std::is_trivial<_Tp>(), [&]() { *__z = std::move(*__x); },
+                             [&]() { ::new (std::addressof(*__z)) _Tp(std::move(*__x)); });
         };
 
         auto __move_sequences = [](_BidirectionalIterator __first1, _BidirectionalIterator __last1, _Tp* __first2) {
@@ -2727,7 +2728,7 @@
     if (__last2 - __first2 == 1)
         return !__comp(*__first1, *__first2) && !__comp(*__first2, *__first1);
 
-    return except_handler([&]() {
+    return __except_handler([&]() {
         return !internal::parallel_or(
             std::forward<_ExecutionPolicy>(__exec), __first2, __last2,
             [__first1, __last1, __first2, __last2, &__comp](_ForwardIterator2 __i, _ForwardIterator2 __j) {
@@ -2792,8 +2793,8 @@
 
     par_backend::buffer<_T> __buf(__size_func(__n1, __n2));
 
-    return except_handler([&__exec, __n1, __first1, __last1, __first2, __last2, __result, __is_vector, __comp,
-                           __size_func, __set_op, &__buf]() {
+    return __except_handler([&__exec, __n1, __first1, __last1, __first2, __last2, __result, __is_vector, __comp,
+                             __size_func, __set_op, &__buf]() {
         auto __buffer = __buf.get();
         _DifferenceType __m{};
         auto __scan = [=](_DifferenceType, _DifferenceType, const _SetRange& __s) { // Scan
@@ -3356,7 +3357,7 @@
     if (__last - __first < 2)
         return __last;
 
-    return internal::except_handler([&]() {
+    return internal::__except_handler([&]() {
         return internal::parallel_find(
             std::forward<_ExecutionPolicy>(__exec), __first, __last,
             [__first, __comp, __is_vector](_RandomAccessIterator __i, _RandomAccessIterator __j) {
@@ -3408,16 +3409,16 @@
     if (__first == __last)
         return __last;
 
-    return internal::except_handler([&]() {
+    return internal::__except_handler([&]() {
         return par_backend::parallel_reduce(
             std::forward<_ExecutionPolicy>(__exec), __first + 1, __last, __first,
             [=](_RandomAccessIterator __begin, _RandomAccessIterator __end,
                 _RandomAccessIterator __init) -> _RandomAccessIterator {
                 const _RandomAccessIterator subresult = __brick_min_element(__begin, __end, __comp, __is_vector);
-                return internal::cmp_iterators_by_values(__init, subresult, __comp);
+                return internal::__cmp_iterators_by_values(__init, subresult, __comp);
             },
             [=](_RandomAccessIterator __it1, _RandomAccessIterator __it2) -> _RandomAccessIterator {
-                return internal::cmp_iterators_by_values(__it1, __it2, __comp);
+                return internal::__cmp_iterators_by_values(__it1, __it2, __comp);
             });
     });
 }
@@ -3464,21 +3465,21 @@
     if (__first == __last)
         return std::make_pair(__first, __first);
 
-    return internal::except_handler([&]() {
+    return internal::__except_handler([&]() {
         typedef std::pair<_ForwardIterator, _ForwardIterator> _Result;
 
         return par_backend::parallel_reduce(
             std::forward<_ExecutionPolicy>(__exec), __first + 1, __last, std::make_pair(__first, __first),
             [=](_ForwardIterator __begin, _ForwardIterator __end, _Result __init) -> _Result {
                 const _Result __subresult = __brick_minmax_element(__begin, __end, __comp, __is_vector);
-                return std::make_pair(internal::cmp_iterators_by_values(__subresult.first, __init.first, __comp),
-                                      internal::cmp_iterators_by_values(__init.second, __subresult.second,
-                                                                        internal::not_pred<_Compare>(__comp)));
+                return std::make_pair(internal::__cmp_iterators_by_values(__subresult.first, __init.first, __comp),
+                                      internal::__cmp_iterators_by_values(__init.second, __subresult.second,
+                                                                          internal::__not_pred<_Compare>(__comp)));
             },
             [=](_Result __p1, _Result __p2) -> _Result {
-                return std::make_pair(
-                    internal::cmp_iterators_by_values(__p1.first, __p2.first, __comp),
-                    internal::cmp_iterators_by_values(__p2.second, __p1.second, internal::not_pred<_Compare>(__comp)));
+                return std::make_pair(internal::__cmp_iterators_by_values(__p1.first, __p2.first, __comp),
+                                      internal::__cmp_iterators_by_values(__p2.second, __p1.second,
+                                                                          internal::__not_pred<_Compare>(__comp)));
             });
     });
 }
@@ -3516,7 +3517,7 @@
                  _ForwardIterator2 __last2, _Predicate __pred, /* __is_vector = */ std::true_type) noexcept
 {
     auto __n = std::min(__last1 - __first1, __last2 - __first2);
-    return unseq_backend::simd_first(__first1, __n, __first2, not_pred<_Predicate>(__pred));
+    return unseq_backend::simd_first(__first1, __n, __first2, __not_pred<_Predicate>(__pred));
 }
 
 template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _Predicate, class _IsVector>
@@ -3536,7 +3537,7 @@
                    _RandomAccessIterator2 __first2, _RandomAccessIterator2 __last2, _Predicate __pred,
                    _IsVector __is_vector, /* is_parallel = */ std::true_type) noexcept
 {
-    return internal::except_handler([&]() {
+    return internal::__except_handler([&]() {
         auto __n = std::min(__last1 - __first1, __last2 - __first2);
         auto __result = internal::parallel_find(
             std::forward<_ExecutionPolicy>(__exec), __first1, __first1 + __n,
Index: include/pstl/internal/glue_algorithm_impl.h
===================================================================
--- include/pstl/internal/glue_algorithm_impl.h
+++ include/pstl/internal/glue_algorithm_impl.h
@@ -40,7 +40,7 @@
 all_of(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Pred __pred)
 {
     return !std::any_of(std::forward<_ExecutionPolicy>(__exec), __first, __last,
-                        __pstl::internal::not_pred<_Pred>(__pred));
+                        __pstl::internal::__not_pred<_Pred>(__pred));
 }
 
 // [alg.none_of]
@@ -93,7 +93,7 @@
 find_if_not(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred)
 {
     return std::find_if(std::forward<_ExecutionPolicy>(__exec), __first, __last,
-                        __pstl::internal::not_pred<_Predicate>(__pred));
+                        __pstl::internal::__not_pred<_Predicate>(__pred));
 }
 
 template <class _ExecutionPolicy, class _ForwardIterator, class _Tp>
@@ -101,7 +101,7 @@
 find(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, const _Tp& __value)
 {
     return std::find_if(std::forward<_ExecutionPolicy>(__exec), __first, __last,
-                        __pstl::internal::equal_value<_Tp>(__value));
+                        __pstl::internal::__equal_value<_Tp>(__value));
 }
 
 // [alg.find.end]
@@ -123,7 +123,7 @@
          _ForwardIterator2 __s_last)
 {
     return std::find_end(std::forward<_ExecutionPolicy>(__exec), __first, __last, __s_first, __s_last,
-                         __pstl::internal::pstl_equal());
+                         __pstl::internal::__pstl_equal());
 }
 
 // [alg.find_first_of]
@@ -145,7 +145,7 @@
               _ForwardIterator2 __s_first, _ForwardIterator2 __s_last)
 {
     return std::find_first_of(std::forward<_ExecutionPolicy>(__exec), __first, __last, __s_first, __s_last,
-                              __pstl::internal::pstl_equal());
+                              __pstl::internal::__pstl_equal());
 }
 
 // [alg.adjacent_find]
@@ -221,7 +221,7 @@
        _ForwardIterator2 __s_last)
 {
     return std::search(std::forward<_ExecutionPolicy>(__exec), __first, __last, __s_first, __s_last,
-                       __pstl::internal::pstl_equal());
+                       __pstl::internal::__pstl_equal());
 }
 
 template <class _ExecutionPolicy, class _ForwardIterator, class _Size, class _Tp, class _BinaryPredicate>
@@ -373,7 +373,7 @@
         const _Tp& __new_value)
 {
     std::replace_if(std::forward<_ExecutionPolicy>(__exec), __first, __last,
-                    __pstl::internal::equal_value<_Tp>(__old_value), __new_value);
+                    __pstl::internal::__equal_value<_Tp>(__old_value), __new_value);
 }
 
 template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _UnaryPredicate, class _Tp>
@@ -397,7 +397,7 @@
              const _Tp& __old_value, const _Tp& __new_value)
 {
     return std::replace_copy_if(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result,
-                                __pstl::internal::equal_value<_Tp>(__old_value), __new_value);
+                                __pstl::internal::__equal_value<_Tp>(__old_value), __new_value);
 }
 
 // [alg.fill]
@@ -459,7 +459,7 @@
                _ForwardIterator2 __result, _Predicate __pred)
 {
     return std::copy_if(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result,
-                        __pstl::internal::not_pred<_Predicate>(__pred));
+                        __pstl::internal::__not_pred<_Predicate>(__pred));
 }
 
 template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _Tp>
@@ -468,7 +468,7 @@
             const _Tp& __value)
 {
     return std::copy_if(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result,
-                        __pstl::internal::not_equal_value<_Tp>(__value));
+                        __pstl::internal::__not_equal_value<_Tp>(__value));
 }
 
 template <class _ExecutionPolicy, class _ForwardIterator, class _UnaryPredicate>
@@ -487,7 +487,7 @@
 remove(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, const _Tp& __value)
 {
     return std::remove_if(std::forward<_ExecutionPolicy>(__exec), __first, __last,
-                          __pstl::internal::equal_value<_Tp>(__value));
+                          __pstl::internal::__equal_value<_Tp>(__value));
 }
 
 // [alg.unique]
@@ -507,7 +507,7 @@
 __pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator>
 unique(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last)
 {
-    return std::unique(std::forward<_ExecutionPolicy>(__exec), __first, __last, __pstl::internal::pstl_equal());
+    return std::unique(std::forward<_ExecutionPolicy>(__exec), __first, __last, __pstl::internal::__pstl_equal());
 }
 
 template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
@@ -526,7 +526,7 @@
 __pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2>
 unique_copy(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result)
 {
-    return std::unique_copy(__exec, __first, __last, __result, __pstl::internal::pstl_equal());
+    return std::unique_copy(__exec, __first, __last, __result, __pstl::internal::__pstl_equal());
 }
 
 // [alg.reverse]
@@ -703,7 +703,7 @@
          _ForwardIterator2 __last2)
 {
     return std::mismatch(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2,
-                         __pstl::internal::pstl_equal());
+                         __pstl::internal::__pstl_equal());
 }
 
 template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2>
@@ -734,7 +734,7 @@
 equal(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2)
 {
     return std::equal(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2,
-                      __pstl::internal::pstl_equal());
+                      __pstl::internal::__pstl_equal());
 }
 
 template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
@@ -754,7 +754,7 @@
 equal(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2,
       _ForwardIterator2 __last2)
 {
-    return equal(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __pstl::internal::pstl_equal());
+    return equal(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __pstl::internal::__pstl_equal());
 }
 
 // [alg.move]
@@ -817,7 +817,7 @@
                   _RandomAccessIterator __d_first, _RandomAccessIterator __d_last)
 {
     return std::partial_sort_copy(std::forward<_ExecutionPolicy>(__exec), __first, __last, __d_first, __d_last,
-                                  __pstl::internal::pstl_less());
+                                  __pstl::internal::__pstl_less());
 }
 
 // [is.sorted]
@@ -827,7 +827,7 @@
 {
     using namespace __pstl;
     const _ForwardIterator __res = internal::__pattern_adjacent_find(
-        std::forward<_ExecutionPolicy>(__exec), __first, __last, __pstl::internal::reorder_pred<_Compare>(__comp),
+        std::forward<_ExecutionPolicy>(__exec), __first, __last, __pstl::internal::__reorder_pred<_Compare>(__comp),
         internal::is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec),
         internal::is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), /*first_semantic*/ false);
     return __res == __last ? __last : std::next(__res);
@@ -847,7 +847,7 @@
 {
     using namespace __pstl;
     return internal::__pattern_adjacent_find(
-               std::forward<_ExecutionPolicy>(__exec), __first, __last, internal::reorder_pred<_Compare>(__comp),
+               std::forward<_ExecutionPolicy>(__exec), __first, __last, internal::__reorder_pred<_Compare>(__comp),
                internal::is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec),
                internal::is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec),
                /*or_semantic*/ true) == __last;
@@ -883,7 +883,7 @@
       _ForwardIterator2 __last2, _ForwardIterator __d_first)
 {
     return std::merge(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, __d_first,
-                      __pstl::internal::pstl_less());
+                      __pstl::internal::__pstl_less());
 }
 
 template <class _ExecutionPolicy, class _BidirectionalIterator, class _Compare>
@@ -927,7 +927,7 @@
          _ForwardIterator2 __last2)
 {
     return std::includes(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2,
-                         __pstl::internal::pstl_less());
+                         __pstl::internal::__pstl_less());
 }
 
 // [set.union]
@@ -953,7 +953,7 @@
           _ForwardIterator2 __last2, _ForwardIterator __result)
 {
     return std::set_union(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, __result,
-                          __pstl::internal::pstl_less());
+                          __pstl::internal::__pstl_less());
 }
 
 // [set.intersection]
@@ -979,7 +979,7 @@
                  _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __result)
 {
     return std::set_intersection(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, __result,
-                                 __pstl::internal::pstl_less());
+                                 __pstl::internal::__pstl_less());
 }
 
 // [set.difference]
@@ -1005,7 +1005,7 @@
                _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __result)
 {
     return std::set_difference(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, __result,
-                               __pstl::internal::pstl_less());
+                               __pstl::internal::__pstl_less());
 }
 
 // [set.symmetric.difference]
@@ -1032,7 +1032,7 @@
                          _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __result)
 {
     return std::set_symmetric_difference(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2,
-                                         __result, __pstl::internal::pstl_less());
+                                         __result, __pstl::internal::__pstl_less());
 }
 
 // [is.heap]
@@ -1096,7 +1096,7 @@
 max_element(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
 {
     return min_element(std::forward<_ExecutionPolicy>(__exec), __first, __last,
-                       __pstl::internal::reorder_pred<_Compare>(__comp));
+                       __pstl::internal::__reorder_pred<_Compare>(__comp));
 }
 
 template <class _ExecutionPolicy, class _ForwardIterator>
@@ -1105,7 +1105,7 @@
 {
     typedef typename std::iterator_traits<_ForwardIterator>::value_type _InputType;
     return std::min_element(std::forward<_ExecutionPolicy>(__exec), __first, __last,
-                            __pstl::internal::reorder_pred<std::less<_InputType>>(std::less<_InputType>()));
+                            __pstl::internal::__reorder_pred<std::less<_InputType>>(std::less<_InputType>()));
 }
 
 template <class _ExecutionPolicy, class _ForwardIterator, class _Compare>
@@ -1170,7 +1170,7 @@
                         _ForwardIterator2 __first2, _ForwardIterator2 __last2)
 {
     return std::lexicographical_compare(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2,
-                                        __pstl::internal::pstl_less());
+                                        __pstl::internal::__pstl_less());
 }
 
 } // namespace std
Index: include/pstl/internal/glue_memory_impl.h
===================================================================
--- include/pstl/internal/glue_memory_impl.h
+++ include/pstl/internal/glue_memory_impl.h
@@ -33,7 +33,7 @@
     const auto __is_vector =
         internal::is_vectorization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec);
 
-    return internal::invoke_if_else(
+    return internal::__invoke_if_else(
         std::integral_constant < bool, std::is_trivial<_ValueType1>::value&& std::is_trivial<_ValueType2>::value > (),
         [&]() {
             return internal::__pattern_walk2_brick(
@@ -67,7 +67,7 @@
     const auto __is_vector =
         internal::is_vectorization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec);
 
-    return internal::invoke_if_else(
+    return internal::__invoke_if_else(
         std::integral_constant < bool, std::is_trivial<_ValueType1>::value&& std::is_trivial<_ValueType2>::value > (),
         [&]() {
             return internal::__pattern_walk2_brick_n(
@@ -103,7 +103,7 @@
     const auto __is_vector =
         internal::is_vectorization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec);
 
-    return internal::invoke_if_else(
+    return internal::__invoke_if_else(
         std::integral_constant < bool, std::is_trivial<_ValueType1>::value&& std::is_trivial<_ValueType2>::value > (),
         [&]() {
             return internal::__pattern_walk2_brick(
@@ -137,7 +137,7 @@
     const auto __is_vector =
         internal::is_vectorization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec);
 
-    return internal::invoke_if_else(
+    return internal::__invoke_if_else(
         std::integral_constant < bool, std::is_trivial<_ValueType1>::value&& std::is_trivial<_ValueType2>::value > (),
         [&]() {
             return internal::__pattern_walk2_brick_n(
@@ -169,7 +169,7 @@
     const auto __is_parallel = internal::is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec);
     const auto __is_vector = internal::is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec);
 
-    internal::invoke_if_else(
+    internal::__invoke_if_else(
         std::is_arithmetic<_ValueType>(),
         [&]() {
             internal::__pattern_walk_brick(std::forward<_ExecutionPolicy>(__exec), __first, __last,
@@ -197,7 +197,7 @@
     const auto __is_parallel = internal::is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec);
     const auto __is_vector = internal::is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec);
 
-    return internal::invoke_if_else(
+    return internal::__invoke_if_else(
         std::is_arithmetic<_ValueType>(),
         [&]() {
             return internal::__pattern_walk_brick_n(std::forward<_ExecutionPolicy>(__exec), __first, __n,
@@ -228,7 +228,7 @@
     const auto __is_parallel = internal::is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec);
     const auto __is_vector = internal::is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec);
 
-    internal::invoke_if_not(std::is_trivially_destructible<_ValueType>(), [&]() {
+    internal::__invoke_if_not(std::is_trivially_destructible<_ValueType>(), [&]() {
         internal::__pattern_walk1(std::forward<_ExecutionPolicy>(__exec), __first, __last,
                                   [](_ReferenceType __val) { __val.~_ValueType(); }, __is_vector, __is_parallel);
     });
@@ -245,7 +245,7 @@
     const auto __is_parallel = internal::is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec);
     const auto __is_vector = internal::is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec);
 
-    return internal::invoke_if_else(
+    return internal::__invoke_if_else(
         std::is_trivially_destructible<_ValueType>(), [&]() { return std::next(__first, __n); },
         [&]() {
             return internal::__pattern_walk1_n(std::forward<_ExecutionPolicy>(__exec), __first, __n,
@@ -267,7 +267,7 @@
     const auto __is_parallel = internal::is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec);
     const auto __is_vector = internal::is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec);
 
-    internal::invoke_if_not(std::is_trivial<_ValueType>(), [&]() {
+    internal::__invoke_if_not(std::is_trivial<_ValueType>(), [&]() {
         internal::__pattern_walk1(std::forward<_ExecutionPolicy>(__exec), __first, __last,
                                   [](_ReferenceType __val) { ::new (std::addressof(__val)) _ValueType; }, __is_vector,
                                   __is_parallel);
@@ -285,13 +285,13 @@
     const auto __is_parallel = internal::is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec);
     const auto __is_vector = internal::is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec);
 
-    return internal::invoke_if_else(std::is_trivial<_ValueType>(), [&]() { return std::next(__first, __n); },
-                                    [&]() {
-                                        return internal::__pattern_walk1_n(
-                                            std::forward<_ExecutionPolicy>(__exec), __first, __n,
-                                            [](_ReferenceType __val) { ::new (std::addressof(__val)) _ValueType; },
-                                            __is_vector, __is_parallel);
-                                    });
+    return internal::__invoke_if_else(std::is_trivial<_ValueType>(), [&]() { return std::next(__first, __n); },
+                                      [&]() {
+                                          return internal::__pattern_walk1_n(
+                                              std::forward<_ExecutionPolicy>(__exec), __first, __n,
+                                              [](_ReferenceType __val) { ::new (std::addressof(__val)) _ValueType; },
+                                              __is_vector, __is_parallel);
+                                      });
 }
 
 // [uninitialized.construct.value]
@@ -307,7 +307,7 @@
     const auto __is_parallel = internal::is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec);
     const auto __is_vector = internal::is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec);
 
-    internal::invoke_if_else(
+    internal::__invoke_if_else(
         std::is_trivial<_ValueType>(),
         [&]() {
             internal::__pattern_walk_brick(std::forward<_ExecutionPolicy>(__exec), __first, __last,
@@ -334,7 +334,7 @@
     const auto __is_parallel = internal::is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec);
     const auto __is_vector = internal::is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec);
 
-    return internal::invoke_if_else(
+    return internal::__invoke_if_else(
         std::is_trivial<_ValueType>(),
         [&]() {
             return internal::__pattern_walk_brick_n(std::forward<_ExecutionPolicy>(__exec), __first, __n,
Index: include/pstl/internal/glue_numeric_impl.h
===================================================================
--- include/pstl/internal/glue_numeric_impl.h
+++ include/pstl/internal/glue_numeric_impl.h
@@ -26,7 +26,7 @@
        _BinaryOperation __binary_op)
 {
     return transform_reduce(std::forward<_ExecutionPolicy>(__exec), __first, __last, __init, __binary_op,
-                            __pstl::internal::no_op());
+                            __pstl::internal::__no_op());
 }
 
 template <class _ExecutionPolicy, class _ForwardIterator, class _Tp>
@@ -34,7 +34,7 @@
 reduce(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Tp __init)
 {
     return transform_reduce(std::forward<_ExecutionPolicy>(__exec), __first, __last, __init, std::plus<_Tp>(),
-                            __pstl::internal::no_op());
+                            __pstl::internal::__no_op());
 }
 
 template <class _ExecutionPolicy, class _ForwardIterator>
@@ -43,7 +43,7 @@
 {
     typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType;
     return transform_reduce(std::forward<_ExecutionPolicy>(__exec), __first, __last, _ValueType{},
-                            std::plus<_ValueType>(), __pstl::internal::no_op());
+                            std::plus<_ValueType>(), __pstl::internal::__no_op());
 }
 
 // [transform.reduce]
@@ -95,7 +95,7 @@
                _ForwardIterator2 __result, _Tp __init)
 {
     return transform_exclusive_scan(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, __init,
-                                    std::plus<_Tp>(), __pstl::internal::no_op());
+                                    std::plus<_Tp>(), __pstl::internal::__no_op());
 }
 
 template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _Tp, class _BinaryOperation>
@@ -104,7 +104,7 @@
                _ForwardIterator2 __result, _Tp __init, _BinaryOperation __binary_op)
 {
     return transform_exclusive_scan(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, __init,
-                                    __binary_op, __pstl::internal::no_op());
+                                    __binary_op, __pstl::internal::__no_op());
 }
 
 // [inclusive.scan]
@@ -116,7 +116,7 @@
 {
     typedef typename iterator_traits<_ForwardIterator1>::value_type _InputType;
     return transform_inclusive_scan(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result,
-                                    std::plus<_InputType>(), __pstl::internal::no_op());
+                                    std::plus<_InputType>(), __pstl::internal::__no_op());
 }
 
 template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _BinaryOperation>
@@ -125,7 +125,7 @@
                _ForwardIterator2 __result, _BinaryOperation __binary_op)
 {
     return transform_inclusive_scan(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, __binary_op,
-                                    __pstl::internal::no_op());
+                                    __pstl::internal::__no_op());
 }
 
 template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _Tp, class _BinaryOperation>
@@ -134,7 +134,7 @@
                _ForwardIterator2 __result, _BinaryOperation __binary_op, _Tp __init)
 {
     return transform_inclusive_scan(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, __binary_op,
-                                    __pstl::internal::no_op(), __init);
+                                    __pstl::internal::__no_op(), __init);
 }
 
 // [transform.exclusive.scan]
Index: include/pstl/internal/numeric_impl.h
===================================================================
--- include/pstl/internal/numeric_impl.h
+++ include/pstl/internal/numeric_impl.h
@@ -71,7 +71,7 @@
                            _RandomAccessIterator2 __first2, _Tp __init, _BinaryOperation1 __binary_op1,
                            _BinaryOperation2 __binary_op2, _IsVector __is_vector, /*is_parallel=*/std::true_type)
 {
-    return internal::except_handler([&]() {
+    return internal::__except_handler([&]() {
         return par_backend::parallel_transform_reduce(
             std::forward<_ExecutionPolicy>(__exec), __first1, __last1,
             [__first1, __first2, __binary_op2](_RandomAccessIterator1 __i) mutable {
@@ -133,7 +133,7 @@
                            _BinaryOperation __binary_op, _UnaryOperation __unary_op, _IsVector __is_vector,
                            /*is_parallel=*/std::true_type)
 {
-    return except_handler([&]() {
+    return __except_handler([&]() {
         return par_backend::parallel_transform_reduce(
             std::forward<_ExecutionPolicy>(__exec), __first, __last,
             [__unary_op](_ForwardIterator __i) mutable { return __unary_op(*__i); }, __init, __binary_op,
@@ -238,7 +238,7 @@
 {
     typedef typename std::iterator_traits<_RandomAccessIterator>::difference_type _DifferenceType;
 
-    return internal::except_handler([&]() {
+    return internal::__except_handler([&]() {
         par_backend::parallel_transform_scan(
             std::forward<_ExecutionPolicy>(__exec), __last - __first,
             [__first, __unary_op](_DifferenceType __i) mutable { return __unary_op(__first[__i]); }, __init,
@@ -274,7 +274,7 @@
     {
         return __result;
     }
-    return except_handler([&]() {
+    return __except_handler([&]() {
         par_backend::parallel_strict_scan(
             std::forward<_ExecutionPolicy>(__exec), __n, __init,
             [__first, __unary_op, __binary_op, __result, __is_vector](_DifferenceType __i, _DifferenceType __len) {
Index: include/pstl/internal/unseq_backend_simd.h
===================================================================
--- include/pstl/internal/unseq_backend_simd.h
+++ include/pstl/internal/unseq_backend_simd.h
@@ -796,7 +796,7 @@
         for (; __first != __last; ++__first)
         {
             if (simd_or(__s_first, __n2,
-                        internal::equal_value_by_pred<decltype(*__first), _BinaryPredicate>(*__first, __pred)))
+                        internal::__equal_value_by_pred<decltype(*__first), _BinaryPredicate>(*__first, __pred)))
             {
                 return __first;
             }
Index: include/pstl/internal/utils.h
===================================================================
--- include/pstl/internal/utils.h
+++ include/pstl/internal/utils.h
@@ -20,7 +20,7 @@
 
 template <typename _Fp>
 typename std::result_of<_Fp()>::type
-except_handler(_Fp __f)
+__except_handler(_Fp __f)
 {
     try
     {
@@ -38,46 +38,46 @@
 
 template <typename _Fp>
 void
-invoke_if(std::true_type, _Fp __f)
+__invoke_if(std::true_type, _Fp __f)
 {
     __f();
 }
 
 template <typename _Fp>
 void
-invoke_if(std::false_type, _Fp __f)
+__invoke_if(std::false_type, _Fp __f)
 {
 }
 
 template <typename _Fp>
 void
-invoke_if_not(std::false_type, _Fp __f)
+__invoke_if_not(std::false_type, _Fp __f)
 {
     __f();
 }
 
 template <typename _Fp>
 void
-invoke_if_not(std::true_type, _Fp __f)
+__invoke_if_not(std::true_type, _Fp __f)
 {
 }
 
 template <typename _F1, typename _F2>
 typename std::result_of<_F1()>::type
-invoke_if_else(std::true_type, _F1 __f1, _F2 __f2)
+__invoke_if_else(std::true_type, _F1 __f1, _F2 __f2)
 {
     return __f1();
 }
 
 template <typename _F1, typename _F2>
 typename std::result_of<_F2()>::type
-invoke_if_else(std::false_type, _F1 __f1, _F2 __f2)
+__invoke_if_else(std::false_type, _F1 __f1, _F2 __f2)
 {
     return __f2();
 }
 
 //! Unary operator that returns reference to its argument.
-struct no_op
+struct __no_op
 {
     template <typename _Tp>
     _Tp&&
@@ -89,12 +89,12 @@
 
 //! Logical negation of a predicate
 template <typename _Pred>
-class not_pred
+class __not_pred
 {
     _Pred _M_pred;
 
   public:
-    explicit not_pred(_Pred __pred) : _M_pred(__pred) {}
+    explicit __not_pred(_Pred __pred) : _M_pred(__pred) {}
 
     template <typename... _Args>
     bool
@@ -105,12 +105,12 @@
 };
 
 template <typename _Pred>
-class reorder_pred
+class __reorder_pred
 {
     _Pred _M_pred;
 
   public:
-    explicit reorder_pred(_Pred __pred) : _M_pred(__pred) {}
+    explicit __reorder_pred(_Pred __pred) : _M_pred(__pred) {}
 
     template <typename _FTp, typename _STp>
     bool
@@ -123,10 +123,10 @@
 //! "==" comparison.
 /** Not called "equal" to avoid (possibly unfounded) concerns about accidental invocation via
     argument-dependent name lookup by code expecting to find the usual std::equal. */
-class pstl_equal
+class __pstl_equal
 {
   public:
-    explicit pstl_equal() {}
+    explicit __pstl_equal() {}
 
     template <typename _Xp, typename _Yp>
     bool
@@ -137,10 +137,10 @@
 };
 
 //! "<" comparison.
-class pstl_less
+class __pstl_less
 {
   public:
-    explicit pstl_less() {}
+    explicit __pstl_less() {}
 
     template <typename _Xp, typename _Yp>
     bool
@@ -152,13 +152,13 @@
 
 //! Like a polymorphic lambda for pred(...,value)
 template <typename _Tp, typename _Predicate>
-class equal_value_by_pred
+class __equal_value_by_pred
 {
     const _Tp& _M_value;
     _Predicate _M_pred;
 
   public:
-    equal_value_by_pred(const _Tp& __value, _Predicate __pred) : _M_value(__value), _M_pred(__pred) {}
+    __equal_value_by_pred(const _Tp& __value, _Predicate __pred) : _M_value(__value), _M_pred(__pred) {}
 
     template <typename _Arg>
     bool
@@ -170,12 +170,12 @@
 
 //! Like a polymorphic lambda for ==value
 template <typename _Tp>
-class equal_value
+class __equal_value
 {
     const _Tp& _M_value;
 
   public:
-    explicit equal_value(const _Tp& __value) : _M_value(__value) {}
+    explicit __equal_value(const _Tp& __value) : _M_value(__value) {}
 
     template <typename _Arg>
     bool
@@ -187,12 +187,12 @@
 
 //! Logical negation of ==value
 template <typename _Tp>
-class not_equal_value
+class __not_equal_value
 {
     const _Tp& _M_value;
 
   public:
-    explicit not_equal_value(const _Tp& __value) : _M_value(__value) {}
+    explicit __not_equal_value(const _Tp& __value) : _M_value(__value) {}
 
     template <typename _Arg>
     bool
@@ -204,7 +204,7 @@
 
 template <typename _ForwardIterator, typename _Compare>
 _ForwardIterator
-cmp_iterators_by_values(_ForwardIterator __a, _ForwardIterator __b, _Compare __comp)
+__cmp_iterators_by_values(_ForwardIterator __a, _ForwardIterator __b, _Compare __comp)
 {
     if (__a < __b)
     { // we should return closer iterator
Index: test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
===================================================================
--- test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
+++ test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
@@ -39,7 +39,7 @@
         EXPECT_TRUE(std::distance(true_first, actual_ret.first) == std::count_if(first, last, unary_op),
                     "partition_copy has wrong effect from true sequence");
         EXPECT_TRUE(std::distance(false_first, actual_ret.second) ==
-                        std::count_if(first, last, __pstl::internal::not_pred<UnaryOp>(unary_op)),
+                        std::count_if(first, last, __pstl::internal::__not_pred<UnaryOp>(unary_op)),
                     "partition_copy has wrong effect from false sequence");
     }
 
Index: test/std/algorithms/alg.modifying.operations/replace.pass.cpp
===================================================================
--- test/std/algorithms/alg.modifying.operations/replace.pass.cpp
+++ test/std/algorithms/alg.modifying.operations/replace.pass.cpp
@@ -151,7 +151,7 @@
 int32_t
 main()
 {
-    test<int32_t, float32_t>(__pstl::internal::equal_value<int32_t>(666));
+    test<int32_t, float32_t>(__pstl::internal::__equal_value<int32_t>(666));
     test<uint16_t, uint8_t>([](const uint16_t& elem) { return elem % 3 < 2; });
     test<float64_t, int64_t>([](const float64_t& elem) { return elem * elem - 3.5 * elem > 10; });
     test<copy_int, copy_int>([](const copy_int& val) { return val.value / 5 > 2; });
Index: test/std/algorithms/alg.sorting/alg.set.operations/includes.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.set.operations/includes.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.set.operations/includes.pass.cpp
@@ -103,7 +103,7 @@
 main()
 {
 
-    test_includes<float64_t, float64_t>(__pstl::internal::pstl_less());
+    test_includes<float64_t, float64_t>(__pstl::internal::__pstl_less());
     test_includes<Num<int64_t>, Num<int32_t>>([](const Num<int64_t>& x, const Num<int32_t>& y) { return x < y; });
     std::cout << done() << std::endl;
 
Index: test/std/algorithms/alg.sorting/alg.set.operations/set.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.set.operations/set.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.set.operations/set.pass.cpp
@@ -156,7 +156,7 @@
 main()
 {
 
-    test_set<float64_t, float64_t>(__pstl::internal::pstl_less());
+    test_set<float64_t, float64_t>(__pstl::internal::__pstl_less());
     test_set<Num<int64_t>, Num<int32_t>>([](const Num<int64_t>& x, const Num<int32_t>& y) { return x < y; });
 
     test_algo_basic_double<int32_t>(run_for_rnd_fw<test_non_const<int32_t>>());