diff --git a/Src/Base/AMReX_PlotFileUtil.H b/Src/Base/AMReX_PlotFileUtil.H
index dd79bb9089e..724891ac45e 100644
--- a/Src/Base/AMReX_PlotFileUtil.H
+++ b/Src/Base/AMReX_PlotFileUtil.H
@@ -12,7 +12,7 @@
 #include <AMReX_PlotFileUtilHDF5.H>
 #endif
 
-#ifdef AMREX_USE_OPENPMD_API
+#ifdef AMREX_USE_OPENPMD
 #include <AMReX_PlotFileUtilOPENPMD.H>
 #endif
 
diff --git a/Src/Extern/openPMD-api/AMReX_PlotFileUtilOPENPMD.H b/Src/Extern/openPMD-api/AMReX_PlotFileUtilOPENPMD.H
index ed59e0a1da5..f14175dda49 100644
--- a/Src/Extern/openPMD-api/AMReX_PlotFileUtilOPENPMD.H
+++ b/Src/Extern/openPMD-api/AMReX_PlotFileUtilOPENPMD.H
@@ -12,7 +12,7 @@
 #include <AMReX_Particles.H>
 #endif
 
-#ifdef AMREX_USE_OPENPMD_API
+#ifdef AMREX_USE_OPENPMD
 #include <openPMD/openPMD.hpp>
 #endif
 
diff --git a/Src/Extern/openPMD-api/AMReX_PlotFileUtilOPENPMD_PTLImpl.H b/Src/Extern/openPMD-api/AMReX_PlotFileUtilOPENPMD_PTLImpl.H
index f938b5113f8..f7cbe9a2774 100644
--- a/Src/Extern/openPMD-api/AMReX_PlotFileUtilOPENPMD_PTLImpl.H
+++ b/Src/Extern/openPMD-api/AMReX_PlotFileUtilOPENPMD_PTLImpl.H
@@ -654,4 +654,4 @@ namespace amrex::openpmd_api
 
 } // namespace amrex::openpmd_api
 
-#endif // AMREX_PLOTFILE_OPENPMD_API_H
+#endif // AMREX_PLOTFILE_OPENPMD_PTLS_API_H
diff --git a/Src/Extern/openPMD-api/CMakeLists.txt b/Src/Extern/openPMD-api/CMakeLists.txt
index 276f475f30c..c786a4d8712 100644
--- a/Src/Extern/openPMD-api/CMakeLists.txt
+++ b/Src/Extern/openPMD-api/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_amrex_define(AMREX_USE_OPENPMD_API NO_LEGACY IF AMReX_OPENPMD_API)
+add_amrex_define(AMREX_USE_OPENPMD NO_LEGACY IF AMReX_OPENPMD)
 
 foreach(D IN LISTS AMReX_SPACEDIM)
 
diff --git a/Src/Particle/AMReX_ParticleContainer.H b/Src/Particle/AMReX_ParticleContainer.H
index 909bdf06e53..31e481f1470 100644
--- a/Src/Particle/AMReX_ParticleContainer.H
+++ b/Src/Particle/AMReX_ParticleContainer.H
@@ -1355,7 +1355,7 @@ public:
 #include "AMReX_ParticlesHDF5.H"
 #endif
 
-#ifdef AMREX_USE_OPENPMD_API
+#ifdef AMREX_USE_OPENPMD
 #include "AMReX_ParticlesOPENPMD.H"
 #endif
 
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index fedfbfc1ab6..9f33e3a61ef 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -135,7 +135,7 @@ else()
       list(APPEND AMREX_TESTS_SUBDIRS HDF5Benchmark)
    endif ()
 
-   if (AMReX_OPENPMD_API)
+   if (AMReX_OPENPMD)
       list(APPEND AMREX_TESTS_SUBDIRS openPMDTests)
    endif ()
 
diff --git a/Tests/openPMDTests/fields/main.cpp b/Tests/openPMDTests/fields/main.cpp
index 74d4650fead..04c9a2f4476 100644
--- a/Tests/openPMDTests/fields/main.cpp
+++ b/Tests/openPMDTests/fields/main.cpp
@@ -106,7 +106,7 @@ struct TestField
 
 void saveFile(char const* fname, const InputParams& inputs, const TestField& testField)
 {
-#ifdef AMREX_USE_OPENPMD_API
+#ifdef AMREX_USE_OPENPMD
   openpmd_api::InitHandler(fname);
 
   for (int ts = 0; ts < inputs.nplotfile; ts++)
diff --git a/Tools/CMake/AMReXConfig.cmake.in b/Tools/CMake/AMReXConfig.cmake.in
index 58a7228138f..c470680219c 100644
--- a/Tools/CMake/AMReXConfig.cmake.in
+++ b/Tools/CMake/AMReXConfig.cmake.in
@@ -85,7 +85,7 @@ set(AMReX_PETSC_FOUND               @AMReX_PETSC@)
 set(AMReX_SUNDIALS_FOUND            @AMReX_SUNDIALS@)
 set(AMReX_HDF5_FOUND                @AMReX_HDF5@)
 set(AMReX_HDF5_ZFP_FOUND            @AMReX_HDF5_ZFP@)
-set(AMReX_OPENPMD_API_FOUND         @AMReX_OPENPMD_API@)
+set(AMReX_OPENPMD_FOUND             @AMReX_OPENPMD@)
 
 # Compilation options
 set(AMReX_FPE_FOUND                 @AMReX_FPE@)
@@ -137,7 +137,7 @@ set(AMReX_HYPRE                     @AMReX_HYPRE@)
 set(AMReX_PETSC                     @AMReX_PETSC@)
 set(AMReX_HDF5                      @AMReX_HDF5@)
 set(AMReX_HDF5_ZFP                  @AMReX_HDF5_ZFP@)
-set(AMReX_OPENPMD_API               @AMReX_OPENPMD_API@)
+set(AMReX_OPENPMD                   @AMReX_OPENPMD@)
 
 # Compilation options
 set(AMReX_FPE                       @AMReX_FPE@)
@@ -215,7 +215,7 @@ if (@AMReX_HYPRE@)
    find_dependency(HYPRE 2.20.0 REQUIRED)
 endif ()
 
-if (@AMReX_OPENPMD_API@)
+if (@AMReX_OPENPMD@)
     find_dependency(openpmd REQUIRED)
 endif ()
 
diff --git a/Tools/CMake/AMReXOptions.cmake b/Tools/CMake/AMReXOptions.cmake
index 319a6939acc..fb16a5e445f 100644
--- a/Tools/CMake/AMReXOptions.cmake
+++ b/Tools/CMake/AMReXOptions.cmake
@@ -353,8 +353,8 @@ cmake_dependent_option(AMReX_HDF5_ZFP "Enable ZFP compression in HDF5-based IO"
 print_option(AMReX_HDF5_ZFP)
 
 # openPMD-api
-option(AMReX_OPENPMD_API "Enable I/O through openPMD-api" OFF)
-print_option(AMReX_OPENPMD_API)
+option(AMReX_OPENPMD "Enable I/O through openPMD-api" OFF)
+print_option(AMReX_OPENPMD)
 
 # SUNDIALS
 option( AMReX_SUNDIALS "Enable SUNDIALS interfaces" OFF )
diff --git a/Tools/CMake/AMReXSetDefines.cmake b/Tools/CMake/AMReXSetDefines.cmake
index 5a4cc7c76f6..e037651b609 100644
--- a/Tools/CMake/AMReXSetDefines.cmake
+++ b/Tools/CMake/AMReXSetDefines.cmake
@@ -170,7 +170,7 @@ add_amrex_define(AMREX_USE_HDF5_ZFP NO_LEGACY IF AMReX_HDF5_ZFP)
 #
 # openPMD-api
 #
-add_amrex_define(AMREX_USE_OPENPMD_API NO_LEGACY IF AMReX_OPENPMD_API)
+add_amrex_define(AMREX_USE_OPENPMD NO_LEGACY IF AMReX_OPENPMD)
 
 
 #
diff --git a/Tools/CMake/AMReXThirdPartyLibraries.cmake b/Tools/CMake/AMReXThirdPartyLibraries.cmake
index 45c71cb7d8a..71c061332e2 100644
--- a/Tools/CMake/AMReXThirdPartyLibraries.cmake
+++ b/Tools/CMake/AMReXThirdPartyLibraries.cmake
@@ -1,7 +1,7 @@
 #
 # openPMD_api related targets
 #
-if (AMReX_OPENPMD_API)
+if (AMReX_OPENPMD)
     if (AMReX_MPI)
        find_package(openPMD 0.14.2 CONFIG REQUIRED COMPONENTS MPI)
     else ()