diff --git a/batched/dense/impl/KokkosBatched_Vector_SIMD_Arith.hpp b/batched/dense/impl/KokkosBatched_Vector_SIMD_Arith.hpp
index ad10b39c26..ef0cad3d00 100644
--- a/batched/dense/impl/KokkosBatched_Vector_SIMD_Arith.hpp
+++ b/batched/dense/impl/KokkosBatched_Vector_SIMD_Arith.hpp
@@ -27,7 +27,7 @@ namespace KokkosBatched {
 #define KOKKOSKERNELS_SIMD_ARITH_RETURN_REFERENCE_TYPE(T, l) Vector<SIMD<T>, l> &
 
 /// simd, simd
-#if defined(__KOKKOSBATCHED_ENABLE_AVX__)
+#if defined(KOKKOSBATCHED_IMPL_ENABLE_AVX)
 #if defined(__AVX512F__)
 KOKKOS_FORCEINLINE_FUNCTION
 static KOKKOSKERNELS_SIMD_ARITH_RETURN_TYPE(double, 8) operator+(const Vector<SIMD<double>, 8> &a,
@@ -203,7 +203,7 @@ KOKKOS_FORCEINLINE_FUNCTION static KOKKOSKERNELS_SIMD_ARITH_RETURN_REFERENCE_TYP
 
 /// simd, simd
 
-#if defined(__KOKKOSBATCHED_ENABLE_AVX__)
+#if defined(KOKKOSBATCHED_IMPL_ENABLE_AVX)
 #if defined(__AVX512F__)
 KOKKOS_FORCEINLINE_FUNCTION
 static KOKKOSKERNELS_SIMD_ARITH_RETURN_TYPE(double, 8) operator-(const Vector<SIMD<double>, 8> &a,
@@ -390,7 +390,7 @@ KOKKOS_FORCEINLINE_FUNCTION static KOKKOSKERNELS_SIMD_ARITH_RETURN_REFERENCE_TYP
 
 /// simd, simd
 
-#if defined(__KOKKOSBATCHED_ENABLE_AVX__)
+#if defined(KOKKOSBATCHED_IMPL_ENABLE_AVX)
 #if defined(__AVX512F__)
 KOKKOS_FORCEINLINE_FUNCTION
 static KOKKOSKERNELS_SIMD_ARITH_RETURN_TYPE(double, 8) operator*(const Vector<SIMD<double>, 8> &a,
@@ -526,7 +526,7 @@ KOKKOS_FORCEINLINE_FUNCTION static KOKKOSKERNELS_SIMD_ARITH_RETURN_REFERENCE_TYP
 
 /// simd complex, real
 
-#if defined(__KOKKOSBATCHED_ENABLE_AVX__)
+#if defined(KOKKOSBATCHED_IMPL_ENABLE_AVX)
 #if defined(__AVX512F__)
 
 #if !defined(KOKKOS_COMPILER_GNU)
@@ -557,7 +557,7 @@ KOKKOS_FORCEINLINE_FUNCTION static KOKKOSKERNELS_SIMD_ARITH_RETURN_TYPE(Kokkos::
   return a * Vector<SIMD<Kokkos::complex<T> >, l>(b);
 }
 
-#if defined(__KOKKOSBATCHED_ENABLE_AVX__)
+#if defined(KOKKOSBATCHED_IMPL_ENABLE_AVX)
 #if defined(__AVX512F__)
 
 #if !defined(KOKKOS_COMPILER_GNU)
@@ -620,7 +620,7 @@ KOKKOS_FORCEINLINE_FUNCTION static KOKKOSKERNELS_SIMD_ARITH_RETURN_REFERENCE_TYP
 
 /// simd, simd
 
-#if defined(__KOKKOSBATCHED_ENABLE_AVX__)
+#if defined(KOKKOSBATCHED_IMPL_ENABLE_AVX)
 #if defined(__AVX512F__)
 KOKKOS_FORCEINLINE_FUNCTION
 static KOKKOSKERNELS_SIMD_ARITH_RETURN_TYPE(double, 8) operator/(const Vector<SIMD<double>, 8> &a,
@@ -746,7 +746,7 @@ KOKKOS_FORCEINLINE_FUNCTION static KOKKOSKERNELS_SIMD_ARITH_RETURN_REFERENCE_TYP
 }
 
 /// simd, real
-#if defined(__KOKKOSBATCHED_ENABLE_AVX__)
+#if defined(KOKKOSBATCHED_IMPL_ENABLE_AVX)
 #if defined(__AVX512F__)
 
 #if !defined(KOKKOS_COMPILER_GNU)
diff --git a/batched/dense/src/KokkosBatched_Vector_SIMD.hpp b/batched/dense/src/KokkosBatched_Vector_SIMD.hpp
index 82c6e72cb6..cb1bdbb5d4 100644
--- a/batched/dense/src/KokkosBatched_Vector_SIMD.hpp
+++ b/batched/dense/src/KokkosBatched_Vector_SIMD.hpp
@@ -23,10 +23,10 @@
 #include "KokkosKernels_Macros.hpp"
 
 #if defined(__CUDA_ARCH__) || defined(__HIP_DEVICE_COMPILE__)
-#undef __KOKKOSBATCHED_ENABLE_AVX__
-#else
 // compiler bug with AVX in some architectures
-#define __KOKKOSBATCHED_ENABLE_AVX__
+#undef KOKKOSBATCHED_IMPL_ENABLE_AVX
+#else
+#define KOKKOSBATCHED_IMPL_ENABLE_AVX
 #endif
 
 namespace KokkosBatched {
@@ -498,7 +498,7 @@ class Vector<SIMD<double>, 4> {
 }  // namespace KokkosBatched
 #endif
 
-#if defined(__KOKKOSBATCHED_ENABLE_AVX__)
+#if defined(KOKKOSBATCHED_IMPL_ENABLE_AVX)
 #if defined(__AVX__) || defined(__AVX2__)
 
 #if CUDA_VERSION < 12022
@@ -790,7 +790,7 @@ class Vector<SIMD<Kokkos::complex<double> >, 4> {
 }  // namespace KokkosBatched
 
 #endif /* #if defined(__AVX512F__) */
-#endif /* #if defined(__KOKKOSBATCHED_ENABLE_AVX__) */
+#endif /* #if defined(KOKKOSBATCHED_IMPL_ENABLE_AVX) */
 
 #include "KokkosBatched_Vector_SIMD_Arith.hpp"
 #include "KokkosBatched_Vector_SIMD_Logical.hpp"