diff --git a/libcudacxx/.upstream-tests/test/std/containers/views/mdspan/mdspan.extents.cons/array.pass.cpp b/libcudacxx/.upstream-tests/test/std/containers/views/mdspan/mdspan.extents.cons/array.pass.cpp
index b094d1e11ac..e3f37d53378 100644
--- a/libcudacxx/.upstream-tests/test/std/containers/views/mdspan/mdspan.extents.cons/array.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/containers/views/mdspan/mdspan.extents.cons/array.pass.cpp
@@ -55,7 +55,7 @@ int main(int, char**)
 
     static_assert( is_array_cons_avail_v< cuda::std::dextents<   int,2>, my_int, 2 > == true , "" );
 
-#if !defined(TEST_COMPILER_NVCC_BELOW_11_3)
+#if !defined(TEST_COMPILER_CUDACC_BELOW_11_3)
     // Constraint: rank consistency
     static_assert( is_array_cons_avail_v< cuda::std::dextents<   int,1>, int   , 2 > == false, "" );
 
@@ -66,7 +66,7 @@ int main(int, char**)
 #ifndef TEST_COMPILER_NVHPC
     static_assert( is_array_cons_avail_v< cuda::std::dextents<   int,1>, my_int_non_nothrow_constructible, 1 > == false, "" );
 #endif // TEST_COMPILER_NVHPC
-#endif // !defined(TEST_COMPILER_NVCC_BELOW_11_3)
+#endif // !defined(TEST_COMPILER_CUDACC_BELOW_11_3)
 
     return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/containers/views/mdspan/mdspan.extents.cons/span.pass.cpp b/libcudacxx/.upstream-tests/test/std/containers/views/mdspan/mdspan.extents.cons/span.pass.cpp
index 99601e99411..68917577871 100644
--- a/libcudacxx/.upstream-tests/test/std/containers/views/mdspan/mdspan.extents.cons/span.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/containers/views/mdspan/mdspan.extents.cons/span.pass.cpp
@@ -56,7 +56,7 @@ int main(int, char**)
 
     static_assert( is_span_cons_avail_v< cuda::std::dextents<int,2>, my_int, 2 > == true , "" );
 
-#if !defined(TEST_COMPILER_NVCC_BELOW_11_3)
+#if !defined(TEST_COMPILER_CUDACC_BELOW_11_3)
     // Constraint: rank consistency
     static_assert( is_span_cons_avail_v< cuda::std::dextents<int,1>, int   , 2 > == false, "" );
 
@@ -67,7 +67,7 @@ int main(int, char**)
 #ifndef TEST_COMPILER_NVHPC
     static_assert( is_span_cons_avail_v< cuda::std::dextents<int,1>, my_int_non_nothrow_constructible, 1 > == false, "" );
 #endif // TEST_COMPILER_NVHPC
-#endif // !defined(TEST_COMPILER_NVCC_BELOW_11_3)
+#endif // !defined(TEST_COMPILER_CUDACC_BELOW_11_3)
 
     return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/iterators/iterator.range/begin-end.pass.cpp b/libcudacxx/.upstream-tests/test/std/iterators/iterator.range/begin-end.pass.cpp
index 4e87a5e53c2..865e9ac2a83 100644
--- a/libcudacxx/.upstream-tests/test/std/iterators/iterator.range/begin-end.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/iterators/iterator.range/begin-end.pass.cpp
@@ -147,7 +147,7 @@ void test_const_array( const T (&array)[Sz] ) {
 
 STATIC_TEST_GLOBAL_VAR TEST_CONSTEXPR_GLOBAL int global_array [] { 1, 2, 3 };
 #if TEST_STD_VER > 14
-#if !defined(TEST_COMPILER_NVCC_BELOW_11_3)
+#if !defined(TEST_COMPILER_CUDACC_BELOW_11_3)
 STATIC_TEST_GLOBAL_VAR TEST_CONSTEXPR_GLOBAL int global_const_array[] = {0,1,2,3,4};
 #endif // nvcc > 11.2
 #endif // TEST_STD_VER > 14
@@ -216,7 +216,7 @@ int main(int, char**) {
         static_assert ( *cuda::std::crbegin(local_const_array) == 4, "" );
     }
 
-#if !defined(TEST_COMPILER_NVCC_BELOW_11_3)
+#if !defined(TEST_COMPILER_CUDACC_BELOW_11_3)
     {
 
         static_assert ( *cuda::std::begin(global_const_array)   == 0, "" );
diff --git a/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/alg.req.ind.copy/indirectly_copyable_storable.compile.pass.cpp b/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/alg.req.ind.copy/indirectly_copyable_storable.compile.pass.cpp
index 59e36ea0783..bf34c0d4297 100644
--- a/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/alg.req.ind.copy/indirectly_copyable_storable.compile.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/alg.req.ind.copy/indirectly_copyable_storable.compile.pass.cpp
@@ -158,42 +158,42 @@ struct DeletedCopyCtor {
   DeletedCopyCtor& operator=(DeletedCopyCtor const&) = default;
 };
 
-#if TEST_STD_VER > 17 || !defined(TEST_COMPILER_C1XX) //  multiple versions of a defaulted special member functions are not allowed
+#if TEST_STD_VER > 17 || !defined(TEST_COMPILER_MSVC) //  multiple versions of a defaulted special member functions are not allowed
 struct DeletedNonconstCopyCtor {
   DeletedNonconstCopyCtor(DeletedNonconstCopyCtor const&) = default;
   DeletedNonconstCopyCtor(DeletedNonconstCopyCtor&) = delete;
   DeletedNonconstCopyCtor& operator=(DeletedNonconstCopyCtor const&) = default;
 };
 static_assert(!cuda::std::indirectly_copyable_storable<DeletedNonconstCopyCtor*, DeletedNonconstCopyCtor*>);
-#endif // TEST_STD_VER > 17 || !defined(TEST_COMPILER_C1XX)
+#endif // TEST_STD_VER > 17 || !defined(TEST_COMPILER_MSVC)
 
 struct DeletedMoveCtor {
   DeletedMoveCtor(DeletedMoveCtor&&) = delete;
   DeletedMoveCtor& operator=(DeletedMoveCtor&&) = default;
 };
 
-#if TEST_STD_VER > 17 || !defined(TEST_COMPILER_C1XX) //  multiple versions of a defaulted special member functions are not allowed
+#if TEST_STD_VER > 17 || !defined(TEST_COMPILER_MSVC) //  multiple versions of a defaulted special member functions are not allowed
 struct DeletedConstMoveCtor {
   DeletedConstMoveCtor(DeletedConstMoveCtor&&) = default;
   DeletedConstMoveCtor(DeletedConstMoveCtor const&&) = delete;
   DeletedConstMoveCtor& operator=(DeletedConstMoveCtor&&) = default;
 };
 static_assert(!cuda::std::indirectly_copyable_storable<DeletedConstMoveCtor*, DeletedConstMoveCtor*>);
-#endif // TEST_STD_VER > 17 || !defined(TEST_COMPILER_C1XX)
+#endif // TEST_STD_VER > 17 || !defined(TEST_COMPILER_MSVC)
 
 struct DeletedCopyAssignment {
   DeletedCopyAssignment(DeletedCopyAssignment const&) = default;
   DeletedCopyAssignment& operator=(DeletedCopyAssignment const&) = delete;
 };
 
-#if TEST_STD_VER > 17 || !defined(TEST_COMPILER_C1XX) //  multiple versions of a defaulted special member functions are not allowed
+#if TEST_STD_VER > 17 || !defined(TEST_COMPILER_MSVC) //  multiple versions of a defaulted special member functions are not allowed
 struct DeletedNonconstCopyAssignment {
   DeletedNonconstCopyAssignment(DeletedNonconstCopyAssignment const&) = default;
   DeletedNonconstCopyAssignment& operator=(DeletedNonconstCopyAssignment const&) = default;
   DeletedNonconstCopyAssignment& operator=(DeletedNonconstCopyAssignment&) = delete;
 };
 static_assert(!cuda::std::indirectly_copyable_storable<DeletedNonconstCopyAssignment*, DeletedNonconstCopyAssignment*>);
-#endif // TEST_STD_VER > 17 || !defined(TEST_COMPILER_C1XX)
+#endif // TEST_STD_VER > 17 || !defined(TEST_COMPILER_MSVC)
 
 struct DeletedMoveAssignment {
   DeletedMoveAssignment(DeletedMoveAssignment&&) = default;
diff --git a/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.concepts/incrementable.h b/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.concepts/incrementable.h
index 728c38fc12f..b6bae3c87ea 100644
--- a/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.concepts/incrementable.h
+++ b/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.concepts/incrementable.h
@@ -102,9 +102,9 @@ struct postinc_not_declared {
   using difference_type = int;
 
   __host__ __device__ postinc_not_declared& operator++();
-#if defined(TEST_COMPILER_C1XX) // MSVC complains about "single-argument function used for postfix "++" (anachronism)""
+#if defined(TEST_COMPILER_MSVC) // MSVC complains about "single-argument function used for postfix "++" (anachronism)""
   __host__ __device__ postinc_not_declared& operator++(int) = delete;
-#endif // TEST_COMPILER_C1XX
+#endif // TEST_COMPILER_MSVC
 };
 
 struct incrementable_with_difference_type {
diff --git a/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.bidir/bidirectional_iterator.compile.pass.cpp b/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.bidir/bidirectional_iterator.compile.pass.cpp
index 24bd309ac93..29f8ffad44b 100644
--- a/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.bidir/bidirectional_iterator.compile.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.bidir/bidirectional_iterator.compile.pass.cpp
@@ -144,9 +144,9 @@ struct no_postdecrement {
   __host__ __device__ no_postdecrement operator++(int);
 
   __host__ __device__ no_postdecrement& operator--();
-#if defined(TEST_COMPILER_C1XX) //  single-argument function used for postfix "--" (anachronism)
+#if defined(TEST_COMPILER_MSVC) //  single-argument function used for postfix "--" (anachronism)
   __host__ __device__ no_postdecrement& operator--(int) = delete;
-#endif // TEST_COMPILER_C1XX
+#endif // TEST_COMPILER_MSVC
 
 #if TEST_STD_VER > 17
   bool operator==(no_postdecrement const&) const = default;
diff --git a/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/input_iterator.compile.pass.cpp b/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/input_iterator.compile.pass.cpp
index 865d77b499e..c15b1de2d9c 100644
--- a/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/input_iterator.compile.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/input_iterator.compile.pass.cpp
@@ -58,11 +58,11 @@ struct not_weakly_incrementable {
 
   __host__ __device__ int operator*() const;
 
-#if defined(TEST_COMPILER_C1XX) // nvbug4119179
+#if defined(TEST_COMPILER_MSVC) // nvbug4119179
   __host__ __device__ void operator++(int);
 #else
   __host__ __device__ not_weakly_incrementable& operator++();
-#endif // TEST_COMPILER_C1XX
+#endif // TEST_COMPILER_MSVC
 };
 static_assert(!cuda::std::input_or_output_iterator<not_weakly_incrementable> &&
               !cuda::std::input_iterator<not_weakly_incrementable>);
diff --git a/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.cust/iterator.cust.move/iter_move.pass.cpp b/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.cust/iterator.cust.move/iter_move.pass.cpp
index 7240ff62625..b5d859de511 100644
--- a/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.cust/iterator.cust.move/iter_move.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/iterators/iterator.requirements/iterator.cust/iterator.cust.move/iter_move.pass.cpp
@@ -200,10 +200,10 @@ __host__ __device__ constexpr bool test() {
   return true;
 }
 
-#ifndef _LIBCUDACXX_COMPILER_NVCC_BELOW_11_3 // nvcc segfaults here
+#ifndef _LIBCUDACXX_CUDACC_BELOW_11_3 // nvcc segfaults here
 static_assert(!cuda::std::is_invocable_v<IterMoveT, int*, int*>); // too many arguments
 static_assert(!cuda::std::is_invocable_v<IterMoveT, int>);
-#endif // _LIBCUDACXX_COMPILER_NVCC_BELOW_11_3
+#endif // _LIBCUDACXX_CUDACC_BELOW_11_3
 
 #if TEST_STD_VER > 17
 // Test ADL-proofing.
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.expected/ctor/ctor.inplace_init_list.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.expected/ctor/ctor.inplace_init_list.pass.cpp
index eb4a2bb166d..cc2ad611e62 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.expected/ctor/ctor.inplace_init_list.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.expected/ctor/ctor.inplace_init_list.pass.cpp
@@ -146,9 +146,9 @@ __host__ __device__ void testException() {
 int main(int, char**) {
   test();
 #if defined(_LIBCUDACXX_ADDRESSOF)
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test(), "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif // defined(_LIBCUDACXX_ADDRESSOF)
   testException();
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.expected/ctor/ctor.unexpect_init_list.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.expected/ctor/ctor.unexpect_init_list.pass.cpp
index 954d38c72a6..96c6d5f6694 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.expected/ctor/ctor.unexpect_init_list.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.expected/ctor/ctor.unexpect_init_list.pass.cpp
@@ -147,9 +147,9 @@ __host__ __device__ void testException() {
 int main(int, char**) {
   test();
 #if defined(_LIBCUDACXX_ADDRESSOF)
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test(), "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif // defined(_LIBCUDACXX_ADDRESSOF)
   testException();
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.expected/monadic/and_then.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.expected/monadic/and_then.pass.cpp
index 08baa769551..d6d967a5dcd 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.expected/monadic/and_then.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.expected/monadic/and_then.pass.cpp
@@ -368,8 +368,8 @@ constexpr bool test() {
 
 int main(int, char**) {
   test();
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test(), "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.expected/monadic/or_else.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.expected/monadic/or_else.pass.cpp
index 8a819a56022..5263685a12e 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.expected/monadic/or_else.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.expected/monadic/or_else.pass.cpp
@@ -368,8 +368,8 @@ constexpr bool test() {
 
 int main(int, char**) {
   test();
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test(), "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/monadic/and_then.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/monadic/and_then.pass.cpp
index 8642515ef70..125e6db574d 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/monadic/and_then.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/monadic/and_then.pass.cpp
@@ -258,8 +258,8 @@ constexpr bool test() {
 
 int main(int, char**) {
   test();
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test(), "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/monadic/or_else.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/monadic/or_else.pass.cpp
index 0155b0b1265..319fad72546 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/monadic/or_else.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/monadic/or_else.pass.cpp
@@ -355,8 +355,8 @@ constexpr bool test() {
 
 int main(int, char**) {
   test();
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test(), "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/monadic/transform.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/monadic/transform.pass.cpp
index a19c969a86f..6db99d972db 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/monadic/transform.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/monadic/transform.pass.cpp
@@ -213,8 +213,8 @@ constexpr bool test() {
 
 int main(int, char**) {
   test();
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test(), "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/observers/deref.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/observers/deref.pass.cpp
index 296f59c4bda..9e7df1dd5da 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/observers/deref.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/observers/deref.pass.cpp
@@ -40,8 +40,8 @@ __host__ __device__ constexpr bool test() {
 
 int main(int, char**) {
   test();
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test(), "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/observers/value.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/observers/value.pass.cpp
index e7b7b1970dc..46698b6a7c0 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/observers/value.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/expected/expected.void/observers/value.pass.cpp
@@ -83,9 +83,9 @@ __host__ __device__ void testException() {
 
 int main(int, char**) {
   test();
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test(), "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   testException();
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp
index de290abe366..80258844a3d 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/equal.pass.cpp
@@ -74,9 +74,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test());
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp
index 52c3b6aa91f..a039db09760 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/greater.pass.cpp
@@ -74,9 +74,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test());
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp
index 29e43eaa863..8446914f6d9 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/greater_equal.pass.cpp
@@ -76,9 +76,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test());
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp
index c78a6007567..a64260ded4f 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/less_equal.pass.cpp
@@ -76,9 +76,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test());
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp
index b1a1d3cc2a3..4f097212b3a 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/less_than.pass.cpp
@@ -74,9 +74,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test());
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
index 56caca5f293..f4d1b62474e 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.comp_with_t/not_equal.pass.cpp
@@ -74,9 +74,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test());
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.monadic/or_else.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.monadic/or_else.pass.cpp
index de56b9760f5..ad5aab9cf18 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.monadic/or_else.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.monadic/or_else.pass.cpp
@@ -128,7 +128,7 @@ TEST_CONSTEXPR_CXX17 bool test_nontrivial() {
 int main(int, char**) {
   test();
   test_nontrivial();
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   // GCC <9 incorrectly trips on the assertions in this, so disable it there
 #if TEST_STD_VER > 14 && (!defined(TEST_COMPILER_GCC) || __GNUC__ < 9)
   static_assert(test(), "");
@@ -138,6 +138,6 @@ int main(int, char**) {
   static_assert(test_nontrivial());
 #endif // defined(_LIBCUDACXX_ADDRESSOF)
 #endif // TEST_STD_VER > 17
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/equal.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/equal.pass.cpp
index 4271f311f5e..c4751f82d1a 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/equal.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/equal.pass.cpp
@@ -46,9 +46,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test());
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/greater.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/greater.pass.cpp
index 79993322bfb..fbf63f56d1a 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/greater.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/greater.pass.cpp
@@ -46,9 +46,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test());
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/greater_equal.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/greater_equal.pass.cpp
index 35ede59642d..b78a51eaed8 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/greater_equal.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/greater_equal.pass.cpp
@@ -46,9 +46,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test());
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/less_equal.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/less_equal.pass.cpp
index 1b7ebc25d79..617b16e2085 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/less_equal.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/less_equal.pass.cpp
@@ -47,9 +47,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test());
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/less_than.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/less_than.pass.cpp
index c5ffec46a22..eb12dcb637b 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/less_than.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/less_than.pass.cpp
@@ -46,9 +46,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test());
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/not_equal.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/not_equal.pass.cpp
index efc6efab0cc..725082ecf48 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/not_equal.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.nullops/not_equal.pass.cpp
@@ -46,9 +46,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test());
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
index 1f644ad96b6..3b2f7b42ce0 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
@@ -315,9 +315,9 @@ int main(int, char**)
     test_throws();
 
 #if !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     static_assert(pr38638(3) == 5, "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif // !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/const_optional_U.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/const_optional_U.pass.cpp
index 29070c130f1..818e33cf955 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/const_optional_U.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/const_optional_U.pass.cpp
@@ -203,7 +203,7 @@ int main(int, char**)
 {
     test_with_test_type();
     test_ambiguous_assign();
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         optional<int> opt;
         constexpr optional<short> opt2;
@@ -236,7 +236,7 @@ int main(int, char**)
         assert(static_cast<bool>(opt) == static_cast<bool>(opt2));
         assert(*opt == *opt2);
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #ifndef TEST_HAS_NO_EXCEPTIONS
     {
         optional<X> opt;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp
index 0ff8adbff7a..aab0484cebd 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp
@@ -59,10 +59,10 @@ int main(int, char**)
     {
         using O = optional<int>;
 #if !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
         static_assert(assign_empty(O{42}), "");
         static_assert(assign_value(O{42}), "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif // !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
         assert(assign_empty(O{42}));
         assert(assign_value(O{42}));
@@ -70,10 +70,10 @@ int main(int, char**)
     {
         using O = optional<TrivialTestTypes::TestType>;
 #if !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
         static_assert(assign_empty(O{42}), "");
         static_assert(assign_value(O{42}), "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif // !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
         assert(assign_empty(O{42}));
         assert(assign_value(O{42}));
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/move.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/move.pass.cpp
index 21547b45dc6..20a73bc9e74 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/move.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.assign/move.pass.cpp
@@ -77,7 +77,7 @@ int main(int, char**)
         static_assert(static_cast<bool>(opt2) == false, "");
         assert(static_cast<bool>(opt) == static_cast<bool>(opt2));
     }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         optional<int> opt;
         constexpr optional<int> opt2(2);
@@ -87,7 +87,7 @@ int main(int, char**)
         assert(static_cast<bool>(opt) == static_cast<bool>(opt2));
         assert(*opt == *opt2);
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         optional<int> opt(3);
         constexpr optional<int> opt2;
@@ -106,7 +106,7 @@ int main(int, char**)
         assert(static_cast<bool>(opt2) == false);
         assert(static_cast<bool>(opt) == static_cast<bool>(opt2));
     }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         optional<int> opt(3);
         constexpr optional<int> opt2(2);
@@ -116,14 +116,14 @@ int main(int, char**)
         assert(static_cast<bool>(opt) == static_cast<bool>(opt2));
         assert(*opt == *opt2);
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         using O = optional<int>;
 #if !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
         static_assert(assign_empty(O{42}), "");
         static_assert(assign_value(O{42}), "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif // !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
         assert(assign_empty(O{42}));
         assert(assign_value(O{42}));
@@ -131,10 +131,10 @@ int main(int, char**)
     {
         using O = optional<TrivialTestTypes::TestType>;
 #if !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
         static_assert(assign_empty(O{42}), "");
         static_assert(assign_value(O{42}), "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif // !defined(TEST_COMPILER_GCC) || __GNUC__ > 6
         assert(assign_empty(O{42}));
         assert(assign_value(O{42}));
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp
index 7db5eb9cf2e..88a35fa9121 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp
@@ -74,25 +74,25 @@ constexpr bool explicit_conversion(Input&& in, const Expect& v)
 __host__ __device__
 void test_implicit()
 {
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         static_assert(implicit_conversion<long long>(42, 42), "");
     }
     {
         static_assert(implicit_conversion<double>(3.14, 3.14), "");
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         int x = 42;
         optional<void* const> o(&x);
         assert(*o == &x);
     }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         using T = TrivialTestTypes::TestType;
         static_assert(implicit_conversion<T>(42, 42), "");
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         using T = TestTypes::TestType;
         assert(implicit_conversion<T>(3, T(3)));
@@ -121,7 +121,7 @@ void test_implicit()
 
 __host__ __device__
 void test_explicit() {
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         using T = ExplicitTrivialTestTypes::TestType;
         static_assert(explicit_conversion<T>(42, 42), "");
@@ -131,7 +131,7 @@ void test_explicit() {
         static_assert(explicit_conversion<T>(42, 42), "");
         static_assert(!cuda::std::is_convertible<int, T>::value, "");
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         using T = ExplicitTestTypes::TestType;
         T::reset();
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp
index d2413b361a4..ed227744b7f 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp
@@ -27,7 +27,7 @@ using cuda::std::optional;
 
 int main(int, char**)
 {
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         typedef int T;
         constexpr T t(5);
@@ -58,7 +58,7 @@ int main(int, char**)
         };
 
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         const int x = 42;
         optional<const int> o(x);
@@ -85,7 +85,7 @@ int main(int, char**)
         assert(static_cast<bool>(opt) == true);
         assert(opt.value().value == 3);
     }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         typedef ConstexprTestTypes::TestType T;
         constexpr T t(3);
@@ -116,7 +116,7 @@ int main(int, char**)
         };
 
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #ifndef TEST_HAS_NO_EXCEPTIONS
     {
         struct Z {
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/copy.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/copy.pass.cpp
index 7259003b334..855e7d14282 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/copy.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/copy.pass.cpp
@@ -123,10 +123,10 @@ int main(int, char**)
 {
     test<int>();
     test<int>(3);
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     static_assert(constexpr_test<int>(), "" );
     static_assert(constexpr_test<int>(3), "" );
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 
     {
         const optional<const int> o(42);
@@ -172,13 +172,13 @@ int main(int, char**)
     {
         test_reference_extension();
     }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         constexpr cuda::std::optional<int> o1{4};
         constexpr cuda::std::optional<int> o2 = o1;
         static_assert( *o2 == 4, "" );
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/default.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/default.pass.cpp
index 668dd01d154..8c3a2818081 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/default.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/default.pass.cpp
@@ -79,7 +79,7 @@ int main(int, char**)
 #endif
     test<optional<NonLiteralTypes::NoCtors>>();
 
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     static_assert(test_constexpr<optional<int>>(), "");
     static_assert(test_constexpr<optional<int*>>(), "");
 #if !defined(TEST_COMPILER_MSVC) || TEST_STD_VER >= 17
@@ -87,7 +87,7 @@ int main(int, char**)
     static_assert(test_constexpr<optional<NonTrivialTypes::NoCtors>>(), "");
     static_assert(test_constexpr<optional<NonConstexprTypes::NoCtors>>(), "");
 #endif
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/in_place_t.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/in_place_t.pass.cpp
index a7a0e4cc76e..720591a8f91 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/in_place_t.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/in_place_t.pass.cpp
@@ -71,7 +71,7 @@ class Z
 
 int main(int, char**)
 {
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         constexpr optional<int> opt(in_place, 5);
         static_assert(static_cast<bool>(opt) == true, "");
@@ -86,7 +86,7 @@ int main(int, char**)
         };
 
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         optional<const int> opt(in_place, 5);
         assert(*opt == 5);
@@ -106,7 +106,7 @@ int main(int, char**)
         assert(static_cast<bool>(opt) == true);
         assert(*opt == X(5, 4));
     }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         constexpr optional<Y> opt(in_place);
         static_assert(static_cast<bool>(opt) == true, "");
@@ -149,7 +149,7 @@ int main(int, char**)
         };
 
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #ifndef TEST_HAS_NO_EXCEPTIONS
     {
         try
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/initializer_list.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/initializer_list.pass.cpp
index 91bb8b23fea..c262cc1436e 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/initializer_list.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/initializer_list.pass.cpp
@@ -110,13 +110,13 @@ int main(int, char**)
             assert(static_cast<bool>(opt) == true);
             assert((*opt == Y{3, 1}));
         }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
         {
             constexpr optional<Y> opt(in_place, {3, 1});
             static_assert(static_cast<bool>(opt) == true, "");
             static_assert(*opt == Y{3, 1}, "");
         }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 
         struct test_constexpr_ctor
             : public optional<Y>
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp
index 9d69163cfb0..087c62bf927 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp
@@ -156,10 +156,10 @@ int main(int, char**)
 {
     test<int>();
     test<int>(3);
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     static_assert(constexpr_test<int>(), "" );
     static_assert(constexpr_test<int>(3), "" );
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 
     {
         optional<const int> o(42);
@@ -229,13 +229,13 @@ int main(int, char**)
     {
         test_reference_extension();
     }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
     constexpr cuda::std::optional<int> o1{4};
     constexpr cuda::std::optional<int> o2 = cuda::std::move(o1);
     static_assert( *o2 == 4, "" );
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/nullopt_t.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/nullopt_t.pass.cpp
index fabe1ce2202..1506ba94329 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/nullopt_t.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/nullopt_t.pass.cpp
@@ -81,7 +81,7 @@ int main(int, char**)
 #endif
     test<optional<NonLiteralTypes::NoCtors>>();
 
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     static_assert(test_constexpr<optional<int>>(), "");
     static_assert(test_constexpr<optional<int*>>(), "");
 #if !defined(TEST_COMPILER_MSVC) || TEST_STD_VER >= 17
@@ -89,7 +89,7 @@ int main(int, char**)
     static_assert(test_constexpr<optional<NonTrivialTypes::NoCtors>>(), "");
     static_assert(test_constexpr<optional<NonConstexprTypes::NoCtors>>(), "");
 #endif
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp
index 56cd287e058..7cefa55c826 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp
@@ -39,7 +39,7 @@ class Z
 
 int main(int, char**)
 {
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         typedef int T;
         constexpr optional<T> opt(T(5));
@@ -66,7 +66,7 @@ int main(int, char**)
             constexpr test_constexpr_ctor(T&&) {}
         };
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         const int x = 42;
         optional<const int> o(cuda::std::move(x));
@@ -102,7 +102,7 @@ int main(int, char**)
         assert(static_cast<bool>(opt) == true);
         assert(opt.value().value == 3);
     }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         typedef ConstexprTestTypes::TestType T;
         constexpr optional<T> opt = {T(3)};
@@ -144,7 +144,7 @@ int main(int, char**)
         };
 
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #ifndef TEST_HAS_NO_EXCEPTIONS
     {
         try
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/bool.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/bool.pass.cpp
index 39f8f833ddb..60c208e0929 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/bool.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/bool.pass.cpp
@@ -26,7 +26,7 @@ int main(int, char**)
         ASSERT_NOEXCEPT(bool(opt));
         static_assert(!cuda::std::is_convertible<optional<int>, bool>::value, "");
     }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         constexpr optional<int> opt;
         static_assert(!opt, "");
@@ -35,7 +35,7 @@ int main(int, char**)
         constexpr optional<int> opt(0);
         static_assert(opt, "");
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/dereference.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/dereference.pass.cpp
index 6eee861ef28..3368c862c6a 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/dereference.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/dereference.pass.cpp
@@ -65,9 +65,9 @@ int main(int, char**)
         optional<X> opt(X{});
         assert((*opt).test() == 4);
     }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     static_assert(test() == 7, "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 
     return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/dereference_const.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/dereference_const.pass.cpp
index 3d4724cbece..657bfde0093 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/dereference_const.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/dereference_const.pass.cpp
@@ -53,7 +53,7 @@ int main(int, char**)
         // Regardless this function should still be noexcept(false) because
         // it has a narrow contract.
     }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         constexpr optional<X> opt(X{});
         static_assert((*opt).test() == 3, "");
@@ -62,7 +62,7 @@ int main(int, char**)
         constexpr optional<Y> opt(Y{});
         assert((*opt).test() == 2);
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 
     return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/dereference_const_rvalue.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/dereference_const_rvalue.pass.cpp
index c70e2dccbf3..6397216d60b 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/dereference_const_rvalue.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/dereference_const_rvalue.pass.cpp
@@ -53,7 +53,7 @@ int main(int, char**)
         // Regardless this function should still be noexcept(false) because
         // it has a narrow contract.
     }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         constexpr optional<X> opt(X{});
         static_assert((*cuda::std::move(opt)).test() == 5, "");
@@ -62,7 +62,7 @@ int main(int, char**)
         constexpr optional<Y> opt(Y{});
         assert((*cuda::std::move(opt)).test() == 2);
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 
     return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/dereference_rvalue.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/dereference_rvalue.pass.cpp
index 6ab9f9ee0b5..a4156a065a3 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/dereference_rvalue.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/dereference_rvalue.pass.cpp
@@ -65,9 +65,9 @@ int main(int, char**)
         optional<X> opt(X{});
         assert((*cuda::std::move(opt)).test() == 6);
     }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     static_assert(test() == 7, "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 
     return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/has_value.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/has_value.pass.cpp
index 31883e76ee5..8c0377c74b5 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/has_value.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/has_value.pass.cpp
@@ -34,7 +34,7 @@ int main(int, char**)
         optional<int> opt(0);
         assert(opt.has_value());
     }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         constexpr optional<int> opt;
         static_assert(!opt.has_value(), "");
@@ -43,7 +43,7 @@ int main(int, char**)
         constexpr optional<int> opt(0);
         static_assert(opt.has_value(), "");
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/op_arrow.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/op_arrow.pass.cpp
index eac5585bf28..07714d6df6b 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/op_arrow.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/op_arrow.pass.cpp
@@ -60,9 +60,9 @@ int main(int, char**)
     }
     {
 #if defined(_LIBCUDACXX_ADDRESSOF)
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
         static_assert(test() == 3, "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
     }
 
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/op_arrow_const.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/op_arrow_const.pass.cpp
index f64adbada80..0a63766b9d0 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/op_arrow_const.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/op_arrow_const.pass.cpp
@@ -54,7 +54,7 @@ int main(int, char**)
         // Regardless this function should still be noexcept(false) because
         // it has a narrow contract.
     }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         constexpr optional<X> opt(X{});
 #if defined(_LIBCUDACXX_ADDRESSOF)
@@ -75,7 +75,7 @@ int main(int, char**)
         unused(opt);
 #endif
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 
     return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp
index 6994345e687..d440fdeceba 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp
@@ -83,9 +83,9 @@ int main(int, char**)
     }
 #endif
     assert(test() == 7);
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     static_assert(test() == 7, "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp
index aca19151a59..38106afb6c9 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp
@@ -50,12 +50,12 @@ int main(int, char**)
         ASSERT_NOT_NOEXCEPT(opt.value());
         ASSERT_SAME_TYPE(decltype(opt.value()), X const&);
     }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         constexpr optional<X> opt(in_place);
         static_assert(opt.value().test() == 3, "");
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         const optional<X> opt(in_place);
         assert(opt.value().test() == 3);
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp
index 9ed04ed79f3..bc96338602e 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp
@@ -50,12 +50,12 @@ int main(int, char**)
         ASSERT_NOT_NOEXCEPT(cuda::std::move(opt).value());
         ASSERT_SAME_TYPE(decltype(cuda::std::move(opt).value()), X const&&);
     }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         constexpr optional<X> opt(in_place);
         static_assert(cuda::std::move(opt).value().test() == 5, "");
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         const optional<X> opt(in_place);
         assert(cuda::std::move(opt).value().test() == 5);
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value_or_const.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value_or_const.pass.cpp
index a4ea8490961..8d79fef89cc 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value_or_const.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value_or_const.pass.cpp
@@ -45,7 +45,7 @@ struct X
 
 int main(int, char**)
 {
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         constexpr optional<X> opt(2);
         constexpr Y y(3);
@@ -64,7 +64,7 @@ int main(int, char**)
         constexpr optional<X> opt;
         static_assert(opt.value_or(Y(3)) == 4, "");
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         const optional<X> opt(2);
         const Y y(3);
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp
index 40f901ed510..9c6ed4e3ed6 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp
@@ -81,9 +81,9 @@ int main(int, char**)
     }
 #endif
     assert(test() == 7);
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     static_assert(test() == 7, "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 
   return 0;
 }
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/equal.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/equal.pass.cpp
index b724b11a42a..3f4ac0d4020 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/equal.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/equal.pass.cpp
@@ -95,9 +95,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test());
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp
index b556d22eca5..b4fb3c218f0 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/greater_equal.pass.cpp
@@ -93,9 +93,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test());
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/greater_than.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/greater_than.pass.cpp
index f04a52bafd2..39085d54191 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/greater_than.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/greater_than.pass.cpp
@@ -91,9 +91,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test());
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/less_equal.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/less_equal.pass.cpp
index 0591b859c55..6e8268cf1ae 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/less_equal.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/less_equal.pass.cpp
@@ -93,9 +93,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test());
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/less_than.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/less_than.pass.cpp
index 234951577ad..d8772b10a69 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/less_than.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/less_than.pass.cpp
@@ -91,9 +91,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test());
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/not_equal.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/not_equal.pass.cpp
index f76baaec0fa..4b96805f6c5 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/not_equal.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.relops/not_equal.pass.cpp
@@ -96,9 +96,9 @@ constexpr bool test() {
 int main(int, char**) {
   test();
 #if TEST_STD_VER >= 17
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test());
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
 
   return 0;
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.specalg/make_optional.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.specalg/make_optional.pass.cpp
index 7ea96be4b49..f9007498be4 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.specalg/make_optional.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.specalg/make_optional.pass.cpp
@@ -38,13 +38,13 @@ int main(int, char**)
         ASSERT_SAME_TYPE(decltype(opt), cuda::std::optional<int*>);
         assert(*opt == arr);
     }
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         constexpr auto opt = cuda::std::make_optional(2);
         ASSERT_SAME_TYPE(decltype(opt), const cuda::std::optional<int>);
         static_assert(opt.value() == 2, "");
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         auto opt = cuda::std::make_optional(2);
         ASSERT_SAME_TYPE(decltype(opt), cuda::std::optional<int>);
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.specalg/make_optional_explicit.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.specalg/make_optional_explicit.pass.cpp
index 800f07912ba..15f7d6f2c82 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.specalg/make_optional_explicit.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.specalg/make_optional_explicit.pass.cpp
@@ -28,13 +28,13 @@
 
 int main(int, char**)
 {
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
     {
         constexpr auto opt = cuda::std::make_optional<int>('a');
         static_assert(*opt == int('a'), "");
         assert(*opt == int('a'));
     }
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #ifdef _LIBCUDACXX_HAS_STRING
     {
         cuda::std::string s = "123";
diff --git a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.specalg/make_optional_explicit_initializer_list.pass.cpp b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.specalg/make_optional_explicit_initializer_list.pass.cpp
index c7b43f04fd2..f4ca5dc7f4f 100644
--- a/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.specalg/make_optional_explicit_initializer_list.pass.cpp
+++ b/libcudacxx/.upstream-tests/test/std/utilities/optional/optional.specalg/make_optional_explicit_initializer_list.pass.cpp
@@ -57,9 +57,9 @@ int main(int, char**)
 {
   test();
 #if defined(_LIBCUDACXX_ADDRESSOF)
-#if !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#if !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
   static_assert(test(), "");
-#endif // !(defined(TEST_COMPILER_NVCC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
+#endif // !(defined(TEST_COMPILER_CUDACC_BELOW_11_3) && defined(TEST_COMPILER_CLANG))
 #endif
   /*
   {
diff --git a/libcudacxx/.upstream-tests/test/support/test_iterators.h b/libcudacxx/.upstream-tests/test/support/test_iterators.h
index e91ec98f870..9399a311863 100644
--- a/libcudacxx/.upstream-tests/test/support/test_iterators.h
+++ b/libcudacxx/.upstream-tests/test/support/test_iterators.h
@@ -1019,9 +1019,9 @@ struct Proxy {
     return *this;
   }
 
-#if defined(TEST_COMPILER_C1XX)
+#if defined(TEST_COMPILER_MSVC)
 TEST_NV_DIAG_SUPPRESS(1805) // MSVC complains that if we pass a pointer type, adding const is useless
-#endif // TEST_COMPILER_C1XX
+#endif // TEST_COMPILER_MSVC
 
   // const assignment required to make ProxyIterator model cuda::std::indirectly_writable
   _LIBCUDACXX_TEMPLATE(class Other)
@@ -1032,9 +1032,9 @@ TEST_NV_DIAG_SUPPRESS(1805) // MSVC complains that if we pass a pointer type, ad
     return *this;
   }
 
-#if defined(TEST_COMPILER_C1XX)
+#if defined(TEST_COMPILER_MSVC)
 TEST_NV_DIAG_DEFAULT(1805)
-#endif // TEST_COMPILER_C1XX
+#endif // TEST_COMPILER_MSVC
 
   // If `T` is a reference type, the implicitly-generated assignment operator will be deleted (and would take precedence
   // over the templated `operator=` above because it's a better match).
diff --git a/libcudacxx/.upstream-tests/test/support/test_macros.h b/libcudacxx/.upstream-tests/test/support/test_macros.h
index 0786f3b44c0..b9b203a6e29 100644
--- a/libcudacxx/.upstream-tests/test/support/test_macros.h
+++ b/libcudacxx/.upstream-tests/test/support/test_macros.h
@@ -439,9 +439,9 @@ constexpr bool unused(T &&) {return true;}
 #define TEST_CONSTEXPR_GLOBAL _LIBCUDACXX_CONSTEXPR_GLOBAL
 
 // Some convenience macros for checking nvcc versions
-#if defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000
-#define TEST_COMPILER_NVCC_BELOW_11_3
-#endif // defined(TEST_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000
+#if defined(__CUDACC__) && _LIBCUDACXX_CUDACC_VER < 1103000
+#define TEST_COMPILER_CUDACC_BELOW_11_3
+#endif // defined(__CUDACC__) && _LIBCUDACXX_CUDACC_VER < 1103000
 
 #if defined(TEST_COMPILER_MSVC)
 #if _MSC_VER < 1920
diff --git a/libcudacxx/include/cuda/std/detail/__annotated_ptr b/libcudacxx/include/cuda/std/detail/__annotated_ptr
index d0f2cd7e5ee..e52c17f6dec 100644
--- a/libcudacxx/include/cuda/std/detail/__annotated_ptr
+++ b/libcudacxx/include/cuda/std/detail/__annotated_ptr
@@ -61,9 +61,9 @@ namespace __detail_ap {
     if (std::is_same<_Property, access_property::shared>::value == true) {
       bool __b = __isShared(__ptr);
       _LIBCUDACXX_ASSERT(__b, "");
-#if !defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_2)
+#if !defined(_LIBCUDACXX_CUDACC_BELOW_11_2)
       __builtin_assume(__b);
-#endif // !defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_2)
+#endif // !defined(_LIBCUDACXX_CUDACC_BELOW_11_2)
     } else if (std::is_same<_Property, access_property::global>::value == true ||
                std::is_same<_Property, access_property::normal>::value == true ||
                std::is_same<_Property, access_property::persisting>::value == true ||
@@ -71,9 +71,9 @@ namespace __detail_ap {
                std::is_same<_Property, access_property>::value) {
       bool __b = __isGlobal(__ptr);
       _LIBCUDACXX_ASSERT(__b, "");
-#if !defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_2)
+#if !defined(_LIBCUDACXX_CUDACC_BELOW_11_2)
       __builtin_assume(__b);
-#endif // !defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_2)
+#endif // !defined(_LIBCUDACXX_CUDACC_BELOW_11_2)
     }
 
     return __ptr;
diff --git a/libcudacxx/include/cuda/std/detail/__config b/libcudacxx/include/cuda/std/detail/__config
index d0803ed9cc6..b6dee85435b 100644
--- a/libcudacxx/include/cuda/std/detail/__config
+++ b/libcudacxx/include/cuda/std/detail/__config
@@ -11,18 +11,6 @@
 #ifndef __cuda_std__
 #define __cuda_std__
 
-#ifdef __CUDACC__
-    #if defined(__clang__) || defined(__FLT16_MANT_DIG__)
-        #include <cuda_fp16.h>
-    #endif
-    #define _LIBCUDACXX_CUDACC_VER_MAJOR __CUDACC_VER_MAJOR__
-    #define _LIBCUDACXX_CUDACC_VER_MINOR __CUDACC_VER_MINOR__
-    #define _LIBCUDACXX_CUDACC_VER_BUILD __CUDACC_VER_BUILD__
-    #define _LIBCUDACXX_CUDACC_VER                                                  \
-        _LIBCUDACXX_CUDACC_VER_MAJOR * 100000 + _LIBCUDACXX_CUDACC_VER_MINOR * 1000 + \
-        _LIBCUDACXX_CUDACC_VER_BUILD
-#endif
-
 #define _LIBCUDACXX_CUDA_API_VERSION 2002000
 
 #define _LIBCUDACXX_CUDA_API_VERSION_MAJOR \
diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/destructible.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/destructible.h
index 6445d2f15ce..6a0ad1bff44 100644
--- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/destructible.h
+++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/destructible.h
@@ -30,6 +30,13 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD
 
 #if _LIBCUDACXX_STD_VER > 11
 
+#if defined(_LIBCUDACXX_COMPILER_MSVC)
+
+template<class _Tp>
+_LIBCUDACXX_CONCEPT destructible = __is_nothrow_destructible(_Tp);
+
+#else // ^^^ _LIBCUDACXX_COMPILER_MSVC ^^^ / vvv !_LIBCUDACXX_COMPILER_MSVC vvv
+
 template<class _Tp, class = void, class = void>
 _LIBCUDACXX_INLINE_VAR constexpr bool __destructible_impl = false;
 
@@ -58,6 +65,8 @@ _LIBCUDACXX_INLINE_VAR constexpr bool __destructible<_Tp[_Nm]> = __destructible<
 template<class _Tp>
 _LIBCUDACXX_CONCEPT destructible = __destructible<_Tp>;
 
+#endif // !_LIBCUDACXX_COMPILER_MSVC
+
 #endif // _LIBCUDACXX_STD_VER > 11
 
 _LIBCUDACXX_END_NAMESPACE_STD
diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/invocable.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/invocable.h
index 51c2bd209dd..44be8f5164d 100644
--- a/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/invocable.h
+++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__concepts/invocable.h
@@ -49,8 +49,9 @@ concept __invoke_constructible = requires(_Fun&& __fun, _Args&&... __args) {
 template<class _Fn, class... _Args>
 _LIBCUDACXX_CONCEPT_FRAGMENT(
   _Invocable_,
-  requires(_Fn&& __fn, _Args&&... __args) //
-  (_CUDA_VSTD::invoke(_CUDA_VSTD::forward<_Fn>(__fn), _CUDA_VSTD::forward<_Args>(__args)...)));
+  requires(_Fn&& __fn, _Args&&... __args)(
+    (_CUDA_VSTD::invoke(_CUDA_VSTD::forward<_Fn>(__fn), _CUDA_VSTD::forward<_Args>(__args)...))
+  ));
 
 template<class _Fn, class... _Args>
 _LIBCUDACXX_CONCEPT invocable = _LIBCUDACXX_FRAGMENT(_Invocable_, _Fn, _Args...);
diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__config b/libcudacxx/include/cuda/std/detail/libcxx/include/__config
index a396e8a666d..5787fd10b22 100644
--- a/libcudacxx/include/cuda/std/detail/libcxx/include/__config
+++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__config
@@ -47,17 +47,31 @@
 #  define _LIBCUDACXX_COMPILER_CLANG_CUDA
 #endif
 
-// Some convenience macros to filter nvcc versions
-#if defined(_LIBCUDACXX_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1102000
-#define _LIBCUDACXX_COMPILER_NVCC_BELOW_11_2
-#endif // defined(_LIBCUDACXX_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1102000
-#if defined(_LIBCUDACXX_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000
-#define _LIBCUDACXX_COMPILER_NVCC_BELOW_11_3
-#endif // defined(_LIBCUDACXX_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1103000
-
-#if defined(_LIBCUDACXX_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1108000
-#define _LIBCUDACXX_COMPILER_NVCC_BELOW_11_8
-#endif // defined(_LIBCUDACXX_COMPILER_NVCC) && _LIBCUDACXX_CUDACC_VER < 1108000
+#ifdef __CUDACC__
+#  define _LIBCUDACXX_CUDACC
+#  define _LIBCUDACXX_CUDACC_VER_MAJOR __CUDACC_VER_MAJOR__
+#  define _LIBCUDACXX_CUDACC_VER_MINOR __CUDACC_VER_MINOR__
+#  define _LIBCUDACXX_CUDACC_VER_BUILD __CUDACC_VER_BUILD__
+#  define _LIBCUDACXX_CUDACC_VER                                                  \
+      _LIBCUDACXX_CUDACC_VER_MAJOR * 100000 + _LIBCUDACXX_CUDACC_VER_MINOR * 1000 + \
+      _LIBCUDACXX_CUDACC_VER_BUILD
+
+// TODO: Determine if this is necessary, I don't know why we automatically include this in <config>
+#  if defined(__clang__) || defined(__FLT16_MANT_DIG__)
+#    include <cuda_fp16.h>
+#  endif
+#endif
+
+// Some convenience macros to filter CUDACC versions
+#if defined(_LIBCUDACXX_CUDACC) && _LIBCUDACXX_CUDACC_VER < 1102000
+#define _LIBCUDACXX_CUDACC_BELOW_11_2
+#endif // defined(_LIBCUDACXX_CUDACC) && _LIBCUDACXX_CUDACC_VER < 1102000
+#if defined(_LIBCUDACXX_CUDACC) && _LIBCUDACXX_CUDACC_VER < 1103000
+#define _LIBCUDACXX_CUDACC_BELOW_11_3
+#endif // defined(_LIBCUDACXX_CUDACC) && _LIBCUDACXX_CUDACC_VER < 1103000
+#if defined(_LIBCUDACXX_CUDACC) && _LIBCUDACXX_CUDACC_VER < 1108000
+#define _LIBCUDACXX_CUDACC_BELOW_11_8
+#endif // defined(_LIBCUDACXX_CUDACC) && _LIBCUDACXX_CUDACC_VER < 1108000
 
 #if defined(_MSC_VER) && !defined(__clang__)
 #  define _LIBCUDACXX_HAS_PRAGMA_MSVC_WARNING
@@ -651,7 +665,7 @@ extern "C++" {
 #define _LIBCUDACXX_IS_LVALUE_REFERENCE(...) __is_lvalue_reference(__VA_ARGS__)
 #endif // __check_builtin(is_lvalue_reference)
 
-#if defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3)
+#if defined(_LIBCUDACXX_CUDACC_BELOW_11_3)
 #define _LIBCUDACXX_USE_IS_LVALUE_REFERENCE_FALLBACK
 #endif // nvcc < 11.3
 
@@ -677,7 +691,7 @@ extern "C++" {
 #define _LIBCUDACXX_IS_OBJECT(...) __is_object(__VA_ARGS__)
 #endif // __check_builtin(is_object)
 
-#if defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3)
+#if defined(_LIBCUDACXX_CUDACC_BELOW_11_3)
 #define _LIBCUDACXX_USE_IS_OBJECT_FALLBACK
 #endif // nvcc < 11.3
 
@@ -779,7 +793,7 @@ extern "C++" {
 #define _LIBCUDACXX_IS_UNSIGNED(...) __is_unsigned(__VA_ARGS__)
 #endif // __check_builtin(is_unsigned)
 
-#if defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3)
+#if defined(_LIBCUDACXX_CUDACC_BELOW_11_3)
 #define _LIBCUDACXX_USE_IS_UNSIGNED_FALLBACK
 #endif // nvcc < 11.3
 
@@ -847,30 +861,29 @@ extern "C++" {
 
 #define _LIBCUDACXX_TOSTRING2(_STR) #_STR
 #define _LIBCUDACXX_TOSTRING(_STR) _LIBCUDACXX_TOSTRING2(_STR)
-#if defined(_LIBCUDACXX_COMPILER_NVCC) \
- || defined(_LIBCUDACXX_COMPILER_NVRTC)
-#if defined(__NVCC_DIAG_PRAGMA_SUPPORT__)
-#if defined(_LIBCUDACXX_COMPILER_MSVC)
-# define _LIBCUDACXX_NV_DIAG_SUPPRESS(_WARNING) __pragma(_LIBCUDACXX_TOSTRING(nv_diag_suppress _WARNING))
-# define _LIBCUDACXX_NV_DIAG_DEFAULT(_WARNING)  __pragma(_LIBCUDACXX_TOSTRING(nv_diag_default _WARNING))
-#else // ^^^ MSVC ^^^ / vvv not MSVC
-# define _LIBCUDACXX_NV_DIAG_SUPPRESS(_WARNING)     \
-  _Pragma(_LIBCUDACXX_TOSTRING(nv_diagnostic push)) \
-  _Pragma(_LIBCUDACXX_TOSTRING(nv_diag_suppress _WARNING))
-# define _LIBCUDACXX_NV_DIAG_DEFAULT(_WARNING) _Pragma(_LIBCUDACXX_TOSTRING(nv_diagnostic pop))
-#endif // not MSVC
-#elif defined(_LIBCUDACXX_COMPILER_NVHPC)
-# define _LIBCUDACXX_NV_DIAG_SUPPRESS(_WARNING)  \
-  _Pragma(_LIBCUDACXX_TOSTRING(diagnostic push)) \
-  _Pragma(_LIBCUDACXX_TOSTRING(diag_suppress _WARNING))
-# define _LIBCUDACXX_NV_DIAG_DEFAULT(_WARNING) _Pragma(_LIBCUDACXX_TOSTRING(diagnostic pop))
-#else // _LIBCUDACXX_COMPILER_NVCC_BELOW_11_3
-# define _LIBCUDACXX_NV_DIAG_SUPPRESS(_WARNING) _Pragma(_LIBCUDACXX_TOSTRING(diag_suppress _WARNING))
-# define _LIBCUDACXX_NV_DIAG_DEFAULT(_WARNING)  _Pragma(_LIBCUDACXX_TOSTRING(diag_default _WARNING))
-#endif // !__NVCC_DIAG_PRAGMA_SUPPORT__
-#else // ^^^ _LIBCUDACXX_COMPILER_NVCC || _LIBCUDACXX_COMPILER_NVRTC ^^^ / vvv other compiler vvv
-# define _LIBCUDACXX_NV_DIAG_SUPPRESS(_WARNING)
-# define _LIBCUDACXX_NV_DIAG_DEFAULT(_WARNING)
+#if defined(_LIBCUDACXX_CUDACC)
+#  if defined(__NVCC_DIAG_PRAGMA_SUPPORT__)
+#    if defined(_LIBCUDACXX_COMPILER_MSVC)
+#      define _LIBCUDACXX_NV_DIAG_SUPPRESS(_WARNING) __pragma(_LIBCUDACXX_TOSTRING(nv_diag_suppress _WARNING))
+#      define _LIBCUDACXX_NV_DIAG_DEFAULT(_WARNING)  __pragma(_LIBCUDACXX_TOSTRING(nv_diag_default _WARNING))
+#    else // ^^^ MSVC ^^^ / vvv not MSVC
+#      define _LIBCUDACXX_NV_DIAG_SUPPRESS(_WARNING)     \
+         _Pragma(_LIBCUDACXX_TOSTRING(nv_diagnostic push)) \
+         _Pragma(_LIBCUDACXX_TOSTRING(nv_diag_suppress _WARNING))
+#      define _LIBCUDACXX_NV_DIAG_DEFAULT(_WARNING) _Pragma(_LIBCUDACXX_TOSTRING(nv_diagnostic pop))
+#    endif // not MSVC
+#  elif defined(_LIBCUDACXX_COMPILER_NVHPC)
+#    define _LIBCUDACXX_NV_DIAG_SUPPRESS(_WARNING)  \
+       _Pragma(_LIBCUDACXX_TOSTRING(diagnostic push)) \
+       _Pragma(_LIBCUDACXX_TOSTRING(diag_suppress _WARNING))
+#    define _LIBCUDACXX_NV_DIAG_DEFAULT(_WARNING) _Pragma(_LIBCUDACXX_TOSTRING(diagnostic pop))
+#  else // _LIBCUDACXX_CUDACC_BELOW_11_3
+#    define _LIBCUDACXX_NV_DIAG_SUPPRESS(_WARNING) _Pragma(_LIBCUDACXX_TOSTRING(diag_suppress _WARNING))
+#    define _LIBCUDACXX_NV_DIAG_DEFAULT(_WARNING)  _Pragma(_LIBCUDACXX_TOSTRING(diag_default _WARNING))
+#  endif // !__NVCC_DIAG_PRAGMA_SUPPORT__
+#else // ^^^ _LIBCUDACXX_CUDACC ^^^ / vvv other compiler vvv
+#  define _LIBCUDACXX_NV_DIAG_SUPPRESS(_WARNING)
+#  define _LIBCUDACXX_NV_DIAG_DEFAULT(_WARNING)
 #endif // other compilers
 
 #if defined(_LIBCUDACXX_COMPILER_CLANG)
@@ -1132,7 +1145,7 @@ typedef __char32_t char32_t;
 #endif // !_LIBCUDACXX_HAS_NO_INT128
 
 #ifndef _LIBCUDACXX_HAS_NO_LONG_DOUBLE
-#if defined(__CUDACC__)
+#if defined(_LIBCUDACXX_CUDACC)
 #  define _LIBCUDACXX_HAS_NO_LONG_DOUBLE
 #endif
 #endif // _LIBCUDACXX_HAS_NO_LONG_DOUBLE
@@ -1148,7 +1161,7 @@ typedef __char32_t char32_t;
 // [[msvc::no_unique_address]] though. If/when it does implement
 // [[msvc::no_unique_address]], this should be preferred though.
 #  define _LIBCUDACXX_NO_UNIQUE_ADDRESS [[msvc::no_unique_address]]
-#elif defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) \
+#elif defined(_LIBCUDACXX_CUDACC_BELOW_11_3) \
  || (__has_cpp_attribute(no_unique_address) < 201803L)
 #  define _LIBCUDACXX_HAS_NO_ATTRIBUTE_NO_UNIQUE_ADDRESS
 #  define _LIBCUDACXX_NO_UNIQUE_ADDRESS
@@ -1421,17 +1434,17 @@ typedef __char32_t char32_t;
 #  define _LIBCUDACXX_HIDE_FROM_ABI_AFTER_V1 _LIBCUDACXX_HIDE_FROM_ABI
 #endif
 
-#ifdef __CUDACC__
-#define _LIBCUDACXX_HOST __host__
-#define _LIBCUDACXX_DEVICE __device__
-#define _LIBCUDACXX_HOST_DEVICE __host__ __device__
-#define _LIBCUDACXX_FORCE_INLINE __forceinline__
-#else // ^^^ __CUDACC__ ^^^ / vvv !__CUDACC__
-#define _LIBCUDACXX_HOST
-#define _LIBCUDACXX_DEVICE
-#define _LIBCUDACXX_HOST_DEVICE
-#define _LIBCUDACXX_FORCE_INLINE
-#endif // !__CUDACC__
+#ifdef _LIBCUDACXX_CUDACC
+#  define _LIBCUDACXX_HOST __host__
+#  define _LIBCUDACXX_DEVICE __device__
+#  define _LIBCUDACXX_HOST_DEVICE __host__ __device__
+#  define _LIBCUDACXX_FORCE_INLINE __forceinline__
+#else // ^^^ _LIBCUDACXX_CUDACC ^^^ / vvv !_LIBCUDACXX_CUDACC
+#  define _LIBCUDACXX_HOST
+#  define _LIBCUDACXX_DEVICE
+#  define _LIBCUDACXX_HOST_DEVICE
+#  define _LIBCUDACXX_FORCE_INLINE
+#endif // !_LIBCUDACXX_CUDACC
 
 // Just so we can migrate to the new macros gradually.
 
@@ -1455,13 +1468,13 @@ typedef __char32_t char32_t;
 #ifdef __cuda_std__
 #  define _LIBCUDACXX_BEGIN_NAMESPACE_STD_NOVERSION namespace cuda { namespace std {
 #  define _LIBCUDACXX_END_NAMESPACE_STD_NOVERSION } }
-#  define _CUDA_VSTD cuda::std::_LIBCUDACXX_ABI_NAMESPACE
-#  define _CUDA_VRANGES cuda::std::ranges::_LIBCUDACXX_ABI_NAMESPACE
+#  define _CUDA_VSTD ::cuda::std::_LIBCUDACXX_ABI_NAMESPACE
+#  define _CUDA_VRANGES ::cuda::std::ranges::_LIBCUDACXX_ABI_NAMESPACE
 #else
 #  define _LIBCUDACXX_BEGIN_NAMESPACE_STD_NOVERSION namespace std {
 #  define _LIBCUDACXX_END_NAMESPACE_STD_NOVERSION }
-#  define _CUDA_VSTD std::_LIBCUDACXX_ABI_NAMESPACE
-#  define _CUDA_VRANGES std::ranges::_LIBCUDACXX_ABI_NAMESPACE
+#  define _CUDA_VSTD ::std::_LIBCUDACXX_ABI_NAMESPACE
+#  define _CUDA_VRANGES ::std::ranges::_LIBCUDACXX_ABI_NAMESPACE
 #endif
 
 #ifdef __cuda_std__
@@ -1671,7 +1684,7 @@ typedef unsigned int   char32_t;
 // by defining _LIBCUDACXX_DISABLE_DEPRECATION_WARNINGS.
 // NVCC 11.1 and 11.2 are broken with the deprecated attribute, so disable it
 #if !defined(_LIBCUDACXX_DISABLE_DEPRECATION_WARNINGS) \
- && !defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3)
+ && !defined(_LIBCUDACXX_CUDACC_BELOW_11_3)
 #  if __has_attribute(deprecated)
 #    define _LIBCUDACXX_DEPRECATED __attribute__ ((deprecated))
 #  elif _LIBCUDACXX_STD_VER > 11
@@ -1972,7 +1985,7 @@ extern "C" _LIBCUDACXX_FUNC_VIS void __sanitizer_annotate_contiguous_container(
 #endif
 
 // CUDA Atomics supersede host atomics in order to insert the host/device dispatch layer
-#if defined(_LIBCUDACXX_COMPILER_NVCC) || defined(_LIBCUDACXX_COMPILER_NVRTC) || defined(_LIBCUDACXX_COMPILER_NVHPC) || defined(__CUDACC__)
+#if defined(_LIBCUDACXX_COMPILER_NVCC) || defined(_LIBCUDACXX_COMPILER_NVRTC) || defined(_LIBCUDACXX_COMPILER_NVHPC) || defined(_LIBCUDACXX_CUDACC)
 #  define _LIBCUDACXX_HAS_CUDA_ATOMIC_IMPL
 #endif
 
@@ -2087,7 +2100,7 @@ extern "C" _LIBCUDACXX_FUNC_VIS void __sanitizer_annotate_contiguous_container(
 #define _LIBCUDACXX_HAS_NO_CONSTEXPR_COMPLEX_OPERATIONS
 #elif defined(_MSC_VER)
 #define _LIBCUDACXX_HAS_NO_CONSTEXPR_COMPLEX_OPERATIONS
-#elif defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_8)
+#elif defined(_LIBCUDACXX_CUDACC_BELOW_11_8)
 #define _LIBCUDACXX_HAS_NO_CONSTEXPR_COMPLEX_OPERATIONS
 #endif
 
@@ -2224,7 +2237,7 @@ extern "C" _LIBCUDACXX_FUNC_VIS void __sanitizer_annotate_contiguous_container(
 #endif
 
 #if !defined(_LIBCUDACXX_DISABLE_EXEC_CHECK)
-#if defined(__CUDACC__)                       \
+#if defined(_LIBCUDACXX_CUDACC)                       \
  && !defined(_LIBCUDACXX_COMPILER_NVRTC)      \
  && !defined(_LIBCUDACXX_COMPILER_NVHPC_CUDA) \
  && !defined(_LIBCUDACXX_COMPILER_CLANG_CUDA)
diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/expected_base.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/expected_base.h
index 35327cf8964..5db982e7404 100644
--- a/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/expected_base.h
+++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__expected/expected_base.h
@@ -367,7 +367,7 @@ struct __expected_storage : __expected_destruct<_Tp, _Err>
 
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
   constexpr __expected_storage() noexcept = default;
 
   template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
@@ -461,7 +461,7 @@ struct __expected_copy : __expected_storage<_Tp, _Err>
   using __base = __expected_storage<_Tp, _Err>;
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
   constexpr __expected_copy() noexcept = default;
 
   template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
@@ -481,7 +481,7 @@ struct __expected_copy<_Tp, _Err, false> : __expected_storage<_Tp, _Err>
 
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
   template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
    _LIBCUDACXX_INLINE_VISIBILITY constexpr
   __expected_copy(_Args&&... __args) noexcept(noexcept(__base(_CUDA_VSTD::declval<_Args>()...)))
@@ -519,7 +519,7 @@ struct __expected_move : __expected_copy<_Tp, _Err>
   using __base = __expected_copy<_Tp, _Err>;
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
   constexpr __expected_move() noexcept = default;
 
   template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
@@ -538,7 +538,7 @@ struct __expected_move<_Tp, _Err, false> : __expected_copy<_Tp, _Err>
   using __base = __expected_copy<_Tp, _Err>;
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
   template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
    _LIBCUDACXX_INLINE_VISIBILITY constexpr
   __expected_move(_Args&&... __args) noexcept(noexcept(__base(_CUDA_VSTD::declval<_Args>()...)))
@@ -580,7 +580,7 @@ struct __expected_copy_assign : __expected_move<_Tp, _Err>
   using __base = __expected_move<_Tp, _Err>;
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
   constexpr __expected_copy_assign() noexcept = default;
 
   template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
@@ -599,7 +599,7 @@ struct __expected_copy_assign<_Tp, _Err, false> : __expected_move<_Tp, _Err>
   using __base = __expected_move<_Tp, _Err>;
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
   template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
    _LIBCUDACXX_INLINE_VISIBILITY constexpr
   __expected_copy_assign(_Args&&... __args) noexcept(noexcept(__base(_CUDA_VSTD::declval<_Args>()...)))
@@ -649,7 +649,7 @@ struct __expected_move_assign : __expected_copy_assign<_Tp, _Err>
   using __base = __expected_copy_assign<_Tp, _Err>;
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
   constexpr __expected_move_assign() noexcept = default;
 
   template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
@@ -668,7 +668,7 @@ struct __expected_move_assign<_Tp, _Err, false> : __expected_copy_assign<_Tp, _E
   using __base = __expected_copy_assign<_Tp, _Err>;
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
   template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
    _LIBCUDACXX_INLINE_VISIBILITY constexpr
   __expected_move_assign(_Args&&... __args) noexcept(noexcept(__base(_CUDA_VSTD::declval<_Args>()...)))
@@ -852,7 +852,7 @@ struct __expected_storage<void, _Err> : __expected_destruct<void, _Err>
   using __base = __expected_destruct<void, _Err>;
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
   constexpr __expected_storage() noexcept = default;
 
   template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
@@ -880,7 +880,7 @@ struct __expected_copy<void, _Err, false> : __expected_storage<void, _Err>
   using __base = __expected_storage<void, _Err>;
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
   template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
    _LIBCUDACXX_INLINE_VISIBILITY constexpr
   __expected_copy(_Args&&... __args) noexcept(noexcept(__base(_CUDA_VSTD::declval<_Args>()...)))
@@ -913,7 +913,7 @@ struct __expected_move<void, _Err, false> : __expected_copy<void, _Err>
   using __base = __expected_copy<void, _Err>;
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
   template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
    _LIBCUDACXX_INLINE_VISIBILITY constexpr
   __expected_move(_Args&&... __args) noexcept(noexcept(__base(_CUDA_VSTD::declval<_Args>()...)))
@@ -946,7 +946,7 @@ struct __expected_copy_assign<void, _Err, false> : __expected_move<void, _Err>
   using __base = __expected_move<void, _Err>;
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
   template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
    _LIBCUDACXX_INLINE_VISIBILITY constexpr
   __expected_copy_assign(_Args&&... __args) noexcept(noexcept(__base(_CUDA_VSTD::declval<_Args>()...)))
@@ -988,7 +988,7 @@ struct __expected_move_assign<void, _Err, false> : __expected_copy_assign<void,
   using __base = __expected_copy_assign<void, _Err>;
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
   template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
    _LIBCUDACXX_INLINE_VISIBILITY constexpr
   __expected_move_assign(_Args&&... __args) noexcept(noexcept(__base(_CUDA_VSTD::declval<_Args>()...)))
diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__mdspan/standard_layout_static_array.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__mdspan/standard_layout_static_array.h
index 217c3876ec1..13d9c89f0ec 100644
--- a/libcudacxx/include/cuda/std/detail/libcxx/include/__mdspan/standard_layout_static_array.h
+++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__mdspan/standard_layout_static_array.h
@@ -614,7 +614,7 @@ struct __partially_static_sizes_tagged
   using __psa_impl_t = __standard_layout_psa<
       _Tag, T, _static_t, _CUDA_VSTD::integer_sequence<_static_t, __values_or_sentinals...>>;
 #if defined(_LIBCUDACXX_COMPILER_NVRTC) \
- || defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3)
+ || defined(_LIBCUDACXX_CUDACC_BELOW_11_3)
   template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __psa_impl_t, _Args...), int> = 0>
   __MDSPAN_FORCE_INLINE_FUNCTION constexpr
   __partially_static_sizes_tagged(_Args&&... __args) noexcept(noexcept(__psa_impl_t(_CUDA_VSTD::declval<_Args>()...)))
@@ -666,7 +666,7 @@ struct __partially_static_sizes
   ) noexcept : __base_t(_CUDA_VSTD::move(__vals)) { }
 public:
 #if defined(_LIBCUDACXX_COMPILER_NVRTC) \
- || defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3)
+ || defined(_LIBCUDACXX_CUDACC_BELOW_11_3)
   template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base_t, _Args...), int> = 0>
   __MDSPAN_FORCE_INLINE_FUNCTION constexpr
   __partially_static_sizes(_Args&&... __args) noexcept(noexcept(__base_t(_CUDA_VSTD::declval<_Args>()...)))
diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/__mdspan/static_array.h b/libcudacxx/include/cuda/std/detail/libcxx/include/__mdspan/static_array.h
index 3e65c801aaa..84df90d64c1 100644
--- a/libcudacxx/include/cuda/std/detail/libcxx/include/__mdspan/static_array.h
+++ b/libcudacxx/include/cuda/std/detail/libcxx/include/__mdspan/static_array.h
@@ -263,7 +263,7 @@ class __partially_static_array_with_sentinal
   using __base_t = typename __partially_static_array_impl_maker<_Tp, _static_t, _ValsSeq, __sentinal>::__impl_base;
 public:
 #if defined(_LIBCUDACXX_COMPILER_NVRTC) \
- || defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3)
+ || defined(_LIBCUDACXX_CUDACC_BELOW_11_3)
   constexpr __partially_static_array_with_sentinal() = default;
 
   template<class... _Args>
@@ -288,7 +288,7 @@ struct __partially_static_sizes :
     T, _static_t, _CUDA_VSTD::integer_sequence<_static_t, __values_or_sentinals...>>;
 public:
 #if defined(_LIBCUDACXX_COMPILER_NVRTC) \
- || defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3)
+ || defined(_LIBCUDACXX_CUDACC_BELOW_11_3)
   constexpr __partially_static_sizes() = default;
 
   template<class... _Args>
diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/bit b/libcudacxx/include/cuda/std/detail/libcxx/include/bit
index 7dcad2b03e8..e4e3a274d30 100644
--- a/libcudacxx/include/cuda/std/detail/libcxx/include/bit
+++ b/libcudacxx/include/cuda/std/detail/libcxx/include/bit
@@ -192,7 +192,7 @@ int __fallback_popc64(uint64_t __x) {
 inline _LIBCUDACXX_INLINE_VISIBILITY constexpr
 int __libcpp_ctz(unsigned __x) noexcept {
 #if defined(_LIBCUDACXX_COMPILER_NVRTC) \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3))
 #if defined(_LIBCUDACXX_IS_CONSTANT_EVALUATED) && (_LIBCUDACXX_STD_VER >= 14)
   if (!__libcpp_is_constant_evaluated()) {
     NV_IF_ELSE_TARGET(NV_IS_DEVICE, (
@@ -212,7 +212,7 @@ int __libcpp_ctz(unsigned __x) noexcept {
 inline _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_BIT_CONSTEXPR
 int __libcpp_ctz(unsigned long __x) noexcept {
 #if defined(_LIBCUDACXX_COMPILER_NVRTC) \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3))
 #if defined(_LIBCUDACXX_IS_CONSTANT_EVALUATED) && (_LIBCUDACXX_STD_VER >= 14)
   if (!__libcpp_is_constant_evaluated()) {
     NV_IF_ELSE_TARGET(NV_IS_DEVICE, (
@@ -252,7 +252,7 @@ int __libcpp_ctz(unsigned long long __x) _NOEXCEPT {
 inline _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_BIT_CONSTEXPR
 int __libcpp_clz(unsigned __x)           _NOEXCEPT {
 #if defined(_LIBCUDACXX_COMPILER_NVRTC) \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3))
 #if defined(_LIBCUDACXX_IS_CONSTANT_EVALUATED) && (_LIBCUDACXX_STD_VER >= 14)
   if (!__libcpp_is_constant_evaluated()) {
     NV_IF_ELSE_TARGET(NV_IS_DEVICE, (
@@ -271,7 +271,7 @@ int __libcpp_clz(unsigned __x)           _NOEXCEPT {
 inline _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_BIT_CONSTEXPR
 int __libcpp_clz(unsigned long __x)      _NOEXCEPT {
 #if defined(_LIBCUDACXX_COMPILER_NVRTC) \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3))
 #if defined(_LIBCUDACXX_IS_CONSTANT_EVALUATED) && (_LIBCUDACXX_STD_VER >= 14)
   if (!__libcpp_is_constant_evaluated()) {
     NV_IF_ELSE_TARGET(NV_IS_DEVICE, (
@@ -291,7 +291,7 @@ int __libcpp_clz(unsigned long __x)      _NOEXCEPT {
 inline _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_BIT_CONSTEXPR
 int __libcpp_clz(unsigned long long __x) _NOEXCEPT {
 #if defined(_LIBCUDACXX_COMPILER_NVRTC) \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3))
 #if defined(_LIBCUDACXX_IS_CONSTANT_EVALUATED) && (_LIBCUDACXX_STD_VER >= 14)
   if (!__libcpp_is_constant_evaluated()) {
     NV_IF_ELSE_TARGET(NV_IS_DEVICE, (
@@ -311,7 +311,7 @@ int __libcpp_clz(unsigned long long __x) _NOEXCEPT {
 inline _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_BIT_CONSTEXPR
 int __libcpp_popcount(unsigned __x)           _NOEXCEPT {
 #if defined(_LIBCUDACXX_COMPILER_NVRTC) \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3))
 #if defined(_LIBCUDACXX_IS_CONSTANT_EVALUATED) && (_LIBCUDACXX_STD_VER >= 14)
   if (!__libcpp_is_constant_evaluated()) {
     NV_IF_ELSE_TARGET(NV_IS_DEVICE, (
@@ -331,7 +331,7 @@ int __libcpp_popcount(unsigned __x)           _NOEXCEPT {
 inline _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_BIT_CONSTEXPR
 int __libcpp_popcount(unsigned long __x)      _NOEXCEPT {
 #if defined(_LIBCUDACXX_COMPILER_NVRTC) \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3))
 #if defined(_LIBCUDACXX_IS_CONSTANT_EVALUATED) && (_LIBCUDACXX_STD_VER >= 14)
   if (!__libcpp_is_constant_evaluated()) {
     NV_IF_ELSE_TARGET(NV_IS_DEVICE, (
@@ -351,7 +351,7 @@ int __libcpp_popcount(unsigned long __x)      _NOEXCEPT {
 inline _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_BIT_CONSTEXPR
 int __libcpp_popcount(unsigned long long __x) _NOEXCEPT {
 #if defined(_LIBCUDACXX_COMPILER_NVRTC) \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3))
 #if defined(_LIBCUDACXX_IS_CONSTANT_EVALUATED) && (_LIBCUDACXX_STD_VER >= 14)
   if (!__libcpp_is_constant_evaluated()) {
     NV_IF_ELSE_TARGET(NV_IS_DEVICE, (
diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/cmath b/libcudacxx/include/cuda/std/detail/libcxx/include/cmath
index 66afdae145d..23d299b68a1 100644
--- a/libcudacxx/include/cuda/std/detail/libcxx/include/cmath
+++ b/libcudacxx/include/cuda/std/detail/libcxx/include/cmath
@@ -613,7 +613,7 @@ _LIBCUDACXX_INLINE_VISIBILITY
 _LIBCUDACXX_CONSTEXPR __enable_if_t<is_floating_point<_A1>::value, bool>
 __constexpr_isnan(_A1 __lcpp_x) _NOEXCEPT
 {
-#if defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_8)
+#if defined(_LIBCUDACXX_CUDACC_BELOW_11_8)
     return __isnan(__lcpp_x);
 #elif __has_builtin(__builtin_isnan)
     return __builtin_isnan(__lcpp_x);
@@ -635,7 +635,7 @@ _LIBCUDACXX_INLINE_VISIBILITY
 _LIBCUDACXX_CONSTEXPR __enable_if_t<is_floating_point<_A1>::value, bool>
 __constexpr_isinf(_A1 __lcpp_x) _NOEXCEPT
 {
-#if defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_8)
+#if defined(_LIBCUDACXX_CUDACC_BELOW_11_8)
     return __isinf(__lcpp_x);
 #elif __has_builtin(__builtin_isinf)
     return __builtin_isinf(__lcpp_x);
@@ -657,7 +657,7 @@ _LIBCUDACXX_INLINE_VISIBILITY
 _LIBCUDACXX_CONSTEXPR __enable_if_t<is_floating_point<_A1>::value, bool>
 __constexpr_isfinite(_A1 __lcpp_x) _NOEXCEPT
 {
-#if defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_8)
+#if defined(_LIBCUDACXX_CUDACC_BELOW_11_8)
     return !__isinf(__lcpp_x) && !__isnan(__lcpp_x);
 #elif __has_builtin(__builtin_isfinite)
     return __builtin_isfinite(__lcpp_x);
diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/cstdlib b/libcudacxx/include/cuda/std/detail/libcxx/include/cstdlib
index d01a29973be..52e913c21c6 100644
--- a/libcudacxx/include/cuda/std/detail/libcxx/include/cstdlib
+++ b/libcudacxx/include/cuda/std/detail/libcxx/include/cstdlib
@@ -98,13 +98,13 @@ void *aligned_alloc(size_t alignment, size_t size);                       // C11
 #pragma GCC system_header
 #endif
 
-#if defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_2)
+#if defined(_LIBCUDACXX_CUDACC_BELOW_11_2)
 #ifdef __CUDA_ARCH__
 #  define _LIBCUDACXX_UNREACHABLE() __trap()
 #else // ^^^ __CUDA_ARCH__ ^^^ / vvv !__CUDA_ARCH__ vvv
 #  define _LIBCUDACXX_UNREACHABLE() __builtin_unreachable()
 #endif // !__CUDA_ARCH__
-#elif defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3)
+#elif defined(_LIBCUDACXX_CUDACC_BELOW_11_3)
 #ifdef __CUDA_ARCH__
 #  define _LIBCUDACXX_UNREACHABLE() __builtin_assume(false)
 #else // ^^^ __CUDA_ARCH__ ^^^ / vvv !__CUDA_ARCH__ vvv
diff --git a/libcudacxx/include/cuda/std/detail/libcxx/include/optional b/libcudacxx/include/cuda/std/detail/libcxx/include/optional
index 3ed4cdc953f..1115dd9ad67 100644
--- a/libcudacxx/include/cuda/std/detail/libcxx/include/optional
+++ b/libcudacxx/include/cuda/std/detail/libcxx/include/optional
@@ -347,7 +347,7 @@ struct __optional_storage_base : __optional_destruct_base<_Tp>
 
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
     template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
    _LIBCUDACXX_INLINE_VISIBILITY constexpr
     __optional_storage_base(_Args&&... __args) noexcept(noexcept(__base(_CUDA_VSTD::declval<_Args>()...)))
@@ -433,7 +433,7 @@ struct __optional_copy_base : __optional_storage_base<_Tp>
 
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
     constexpr __optional_copy_base() noexcept = default;
 
     template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
@@ -453,7 +453,7 @@ struct __optional_copy_base<_Tp, false> : __optional_storage_base<_Tp>
 
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
     template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
    _LIBCUDACXX_INLINE_VISIBILITY constexpr
     __optional_copy_base(_Args&&... __args) noexcept(noexcept(__base(_CUDA_VSTD::declval<_Args>()...)))
@@ -486,7 +486,7 @@ struct __optional_move_base : __optional_copy_base<_Tp>
 
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
     constexpr __optional_move_base() noexcept = default;
 
     template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
@@ -507,7 +507,7 @@ struct __optional_move_base<_Tp, false> : __optional_copy_base<_Tp>
 
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
     template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
    _LIBCUDACXX_INLINE_VISIBILITY constexpr
     __optional_move_base(_Args&&... __args) noexcept(noexcept(__base(_CUDA_VSTD::declval<_Args>()...)))
@@ -540,7 +540,7 @@ struct __optional_copy_assign_base : __optional_move_base<_Tp>
     using __base = __optional_move_base<_Tp>;
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
     constexpr __optional_copy_assign_base() noexcept = default;
 
     template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
@@ -559,7 +559,7 @@ struct __optional_copy_assign_base<_Tp, false> : __optional_move_base<_Tp>
     using __base = __optional_move_base<_Tp>;
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
     template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
    _LIBCUDACXX_INLINE_VISIBILITY constexpr
     __optional_copy_assign_base(_Args&&... __args) noexcept(noexcept(__base(_CUDA_VSTD::declval<_Args>()...)))
@@ -592,7 +592,7 @@ struct __optional_move_assign_base : __optional_copy_assign_base<_Tp>
     using __base = __optional_copy_assign_base<_Tp>;
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
     constexpr __optional_move_assign_base() noexcept = default;
 
     template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
@@ -613,7 +613,7 @@ struct __optional_move_assign_base<_Tp, false> : __optional_copy_assign_base<_Tp
 
 // nvbug3961621
 #if defined(_LIBCUDACXX_COMPILER_NVRTC)  \
- || (defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
+ || (defined(_LIBCUDACXX_CUDACC_BELOW_11_3) && defined(_LIBCUDACXX_COMPILER_CLANG))
     template<class... _Args, __enable_if_t<_LIBCUDACXX_TRAIT(is_constructible, __base, _Args...), int> = 0>
    _LIBCUDACXX_INLINE_VISIBILITY constexpr
     __optional_move_assign_base(_Args&&... __args) noexcept(noexcept(__base(_CUDA_VSTD::declval<_Args>()...)))
diff --git a/libcudacxx/include/cuda/stream_ref b/libcudacxx/include/cuda/stream_ref
index ca5b8b917c9..b21b6743281 100644
--- a/libcudacxx/include/cuda/stream_ref
+++ b/libcudacxx/include/cuda/stream_ref
@@ -109,9 +109,9 @@ public:
    * \return true if equal, false if unequal
    */
 
-#if !defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3)
+#if !defined(_LIBCUDACXX_CUDACC_BELOW_11_3)
   _LIBCUDACXX_NODISCARD_ATTRIBUTE
-#endif // !defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3)
+#endif // !defined(_LIBCUDACXX_CUDACC_BELOW_11_3)
   friend constexpr bool operator==(const stream_ref& __lhs, const stream_ref& __rhs) noexcept
   {
     return __lhs.__stream == __rhs.__stream;
@@ -127,9 +127,9 @@ public:
    * \param rhs The second `stream_view` to compare
    * \return true if unequal, false if equal
    */
-#if !defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3)
+#if !defined(_LIBCUDACXX_CUDACC_BELOW_11_3)
   _LIBCUDACXX_NODISCARD_ATTRIBUTE
-#endif // !defined(_LIBCUDACXX_COMPILER_NVCC_BELOW_11_3)
+#endif // !defined(_LIBCUDACXX_CUDACC_BELOW_11_3)
   friend constexpr bool operator!=(const stream_ref& __lhs, const stream_ref& __rhs) noexcept
   {
     return __lhs.__stream != __rhs.__stream;
diff --git a/libcudacxx/libcxx/test/support/test_iterators.h b/libcudacxx/libcxx/test/support/test_iterators.h
index 6bf45fe615f..5034c670a0d 100644
--- a/libcudacxx/libcxx/test/support/test_iterators.h
+++ b/libcudacxx/libcxx/test/support/test_iterators.h
@@ -1036,9 +1036,9 @@ struct Proxy {
     return *this;
   }
 
-#if defined(TEST_COMPILER_C1XX)
+#if defined(TEST_COMPILER_MSVC)
 TEST_NV_DIAG_SUPPRESS(1805) // MSVC complains that if we pass a pointer type, adding const is useless
-#endif // TEST_COMPILER_C1XX
+#endif // TEST_COMPILER_MSVC
 
   // const assignment required to make ProxyIterator model std::indirectly_writable
   _LIBCUDACXX_TEMPLATE(class Other)
@@ -1049,9 +1049,9 @@ TEST_NV_DIAG_SUPPRESS(1805) // MSVC complains that if we pass a pointer type, ad
     return *this;
   }
 
-#if defined(TEST_COMPILER_C1XX)
+#if defined(TEST_COMPILER_MSVC)
 TEST_NV_DIAG_DEFAULT(1805)
-#endif // TEST_COMPILER_C1XX
+#endif // TEST_COMPILER_MSVC
 
   // If `T` is a reference type, the implicitly-generated assignment operator will be deleted (and would take precedence
   // over the templated `operator=` above because it's a better match).