diff --git a/core/src/Kokkos_View.hpp b/core/src/Kokkos_View.hpp
index 7686fa89aa..2af24918db 100644
--- a/core/src/Kokkos_View.hpp
+++ b/core/src/Kokkos_View.hpp
@@ -496,13 +496,13 @@ namespace Kokkos {
 
 // FIXME_OPENMPTARGET - The `declare target` is needed for the Intel GPUs with
 // the OpenMPTarget backend
-#if defined(KOKKOS_ENABLE_OPENMPTARGET) && defined(KOKKOS_ARCH_INTEL_PVC)
+#if defined(KOKKOS_ENABLE_OPENMPTARGET) && defined(KOKKOS_ARCH_INTEL)
 #pragma omp declare target
 #endif
 
 inline constexpr Kokkos::ALL_t ALL{};
 
-#if defined(KOKKOS_ENABLE_OPENMPTARGET) && defined(KOKKOS_ARCH_INTEL_PVC)
+#if defined(KOKKOS_ENABLE_OPENMPTARGET) && defined(KOKKOS_ARCH_INTEL)
 #pragma omp end declare target
 #endif
 
diff --git a/core/src/impl/Kokkos_Atomic_Memory_Order.hpp b/core/src/impl/Kokkos_Atomic_Memory_Order.hpp
index 0cb4f969fa..cf05236204 100644
--- a/core/src/impl/Kokkos_Atomic_Memory_Order.hpp
+++ b/core/src/impl/Kokkos_Atomic_Memory_Order.hpp
@@ -54,13 +54,13 @@ struct memory_order_relaxed_t {
 
 // FIXME_OPENMPTARGET - The `declare target` is needed for the Intel GPUs with
 // the OpenMPTarget backend
-#if defined(KOKKOS_ENABLE_OPENMPTARGET) && defined(KOKKOS_ARCH_INTEL_PVC)
+#if defined(KOKKOS_ENABLE_OPENMPTARGET) && defined(KOKKOS_ARCH_INTEL)
 #pragma omp declare target
 #endif
 
 constexpr memory_order_relaxed_t memory_order_relaxed = {};
 
-#if defined(KOKKOS_ENABLE_OPENMPTARGET) && defined(KOKKOS_ARCH_INTEL_PVC)
+#if defined(KOKKOS_ENABLE_OPENMPTARGET) && defined(KOKKOS_ARCH_INTEL)
 #pragma omp end declare target
 #endif
 
diff --git a/core/unit_test/TestNumericTraits.hpp b/core/unit_test/TestNumericTraits.hpp
index 03203f5d25..38c4f0e05d 100644
--- a/core/unit_test/TestNumericTraits.hpp
+++ b/core/unit_test/TestNumericTraits.hpp
@@ -484,7 +484,7 @@ CHECK_SAME_AS_NUMERIC_LIMITS_MEMBER_FUNCTION(double, denorm_min);
 
 // FIXME_OPENMPTARGET - The static_assert causes issues on Intel GPUs with the
 // OpenMPTarget backend.
-#if !defined(KOKKOS_ENABLE_OPENMPTARGET) && !defined(KOKKOS_ARCH_INTEL_PVC)
+#if !defined(KOKKOS_ENABLE_OPENMPTARGET) && !defined(KOKKOS_ARCH_INTEL)
 CHECK_SAME_AS_NUMERIC_LIMITS_MEMBER_FUNCTION(long double, denorm_min);
 #endif