diff --git a/fft/src/KokkosFFT_OpenMP_plans.hpp b/fft/src/KokkosFFT_Host_plans.hpp
similarity index 98%
rename from fft/src/KokkosFFT_OpenMP_plans.hpp
rename to fft/src/KokkosFFT_Host_plans.hpp
index 2e5cc7db..d1b79231 100644
--- a/fft/src/KokkosFFT_OpenMP_plans.hpp
+++ b/fft/src/KokkosFFT_Host_plans.hpp
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception
 
-#ifndef KOKKOSFFT_OPENMP_PLANS_HPP
-#define KOKKOSFFT_OPENMP_PLANS_HPP
+#ifndef KOKKOSFFT_HOST_PLANS_HPP
+#define KOKKOSFFT_HOST_PLANS_HPP
 
 #include <numeric>
 #include "KokkosFFT_default_types.hpp"
diff --git a/fft/src/KokkosFFT_OpenMP_transform.hpp b/fft/src/KokkosFFT_Host_transform.hpp
similarity index 94%
rename from fft/src/KokkosFFT_OpenMP_transform.hpp
rename to fft/src/KokkosFFT_Host_transform.hpp
index f8ccaf56..a47243ac 100644
--- a/fft/src/KokkosFFT_OpenMP_transform.hpp
+++ b/fft/src/KokkosFFT_Host_transform.hpp
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception
 
-#ifndef KOKKOSFFT_OPENMP_TRANSFORM_HPP
-#define KOKKOSFFT_OPENMP_TRANSFORM_HPP
+#ifndef KOKKOSFFT_HOST_TRANSFORM_HPP
+#define KOKKOSFFT_HOST_TRANSFORM_HPP
 
 #include <fftw3.h>
 
diff --git a/fft/src/KokkosFFT_OpenMP_types.hpp b/fft/src/KokkosFFT_Host_types.hpp
similarity index 97%
rename from fft/src/KokkosFFT_OpenMP_types.hpp
rename to fft/src/KokkosFFT_Host_types.hpp
index ba2be755..7c29d843 100644
--- a/fft/src/KokkosFFT_OpenMP_types.hpp
+++ b/fft/src/KokkosFFT_Host_types.hpp
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception
 
-#ifndef KOKKOSFFT_OPENMP_TYPES_HPP
-#define KOKKOSFFT_OPENMP_TYPES_HPP
+#ifndef KOKKOSFFT_HOST_TYPES_HPP
+#define KOKKOSFFT_HOST_TYPES_HPP
 
 #include <fftw3.h>
 #include "KokkosFFT_common_types.hpp"
diff --git a/fft/src/KokkosFFT_Plans.hpp b/fft/src/KokkosFFT_Plans.hpp
index 18149087..537f7089 100644
--- a/fft/src/KokkosFFT_Plans.hpp
+++ b/fft/src/KokkosFFT_Plans.hpp
@@ -20,7 +20,7 @@
 #if defined(KOKKOS_ENABLE_CUDA)
 #include "KokkosFFT_Cuda_plans.hpp"
 #ifdef ENABLE_HOST_AND_DEVICE
-#include "KokkosFFT_OpenMP_plans.hpp"
+#include "KokkosFFT_Host_plans.hpp"
 #endif
 #elif defined(KOKKOS_ENABLE_HIP)
 #if defined(KOKKOSFFT_ENABLE_TPL_ROCFFT)
@@ -29,19 +29,19 @@
 #include "KokkosFFT_HIP_plans.hpp"
 #endif
 #ifdef ENABLE_HOST_AND_DEVICE
-#include "KokkosFFT_OpenMP_plans.hpp"
+#include "KokkosFFT_Host_plans.hpp"
 #endif
 #elif defined(KOKKOS_ENABLE_SYCL)
 #include "KokkosFFT_SYCL_plans.hpp"
 #ifdef ENABLE_HOST_AND_DEVICE
-#include "KokkosFFT_OpenMP_plans.hpp"
+#include "KokkosFFT_Host_plans.hpp"
 #endif
 #elif defined(KOKKOS_ENABLE_OPENMP)
-#include "KokkosFFT_OpenMP_plans.hpp"
+#include "KokkosFFT_Host_plans.hpp"
 #elif defined(KOKKOS_ENABLE_THREADS)
-#include "KokkosFFT_OpenMP_plans.hpp"
+#include "KokkosFFT_Host_plans.hpp"
 #else
-#include "KokkosFFT_OpenMP_plans.hpp"
+#include "KokkosFFT_Host_plans.hpp"
 #endif
 
 namespace KokkosFFT {
diff --git a/fft/src/KokkosFFT_Transform.hpp b/fft/src/KokkosFFT_Transform.hpp
index 573c01bf..9aeafee8 100644
--- a/fft/src/KokkosFFT_Transform.hpp
+++ b/fft/src/KokkosFFT_Transform.hpp
@@ -16,7 +16,7 @@
 #if defined(KOKKOS_ENABLE_CUDA)
 #include "KokkosFFT_Cuda_transform.hpp"
 #ifdef ENABLE_HOST_AND_DEVICE
-#include "KokkosFFT_OpenMP_transform.hpp"
+#include "KokkosFFT_Host_transform.hpp"
 #endif
 #elif defined(KOKKOS_ENABLE_HIP)
 #if defined(KOKKOSFFT_ENABLE_TPL_ROCFFT)
@@ -25,19 +25,19 @@
 #include "KokkosFFT_HIP_transform.hpp"
 #endif
 #ifdef ENABLE_HOST_AND_DEVICE
-#include "KokkosFFT_OpenMP_transform.hpp"
+#include "KokkosFFT_Host_transform.hpp"
 #endif
 #elif defined(KOKKOS_ENABLE_SYCL)
 #include "KokkosFFT_SYCL_transform.hpp"
 #ifdef ENABLE_HOST_AND_DEVICE
-#include "KokkosFFT_OpenMP_transform.hpp"
+#include "KokkosFFT_Host_transform.hpp"
 #endif
 #elif defined(KOKKOS_ENABLE_OPENMP)
-#include "KokkosFFT_OpenMP_transform.hpp"
+#include "KokkosFFT_Host_transform.hpp"
 #elif defined(KOKKOS_ENABLE_THREADS)
-#include "KokkosFFT_OpenMP_transform.hpp"
+#include "KokkosFFT_Host_transform.hpp"
 #else
-#include "KokkosFFT_OpenMP_transform.hpp"
+#include "KokkosFFT_Host_transform.hpp"
 #endif
 
 #include <type_traits>
diff --git a/fft/src/KokkosFFT_default_types.hpp b/fft/src/KokkosFFT_default_types.hpp
index 29e284ef..a52bb590 100644
--- a/fft/src/KokkosFFT_default_types.hpp
+++ b/fft/src/KokkosFFT_default_types.hpp
@@ -18,11 +18,11 @@
 #elif defined(KOKKOS_ENABLE_SYCL)
 #include "KokkosFFT_SYCL_types.hpp"
 #elif defined(KOKKOS_ENABLE_OPENMP)
-#include "KokkosFFT_OpenMP_types.hpp"
+#include "KokkosFFT_Host_types.hpp"
 #elif defined(KOKKOS_ENABLE_THREADS)
-#include "KokkosFFT_OpenMP_types.hpp"
+#include "KokkosFFT_Host_types.hpp"
 #else
-#include "KokkosFFT_OpenMP_types.hpp"
+#include "KokkosFFT_Host_types.hpp"
 #endif
 
 #include "KokkosFFT_utils.hpp"