diff --git a/cmake/Modules/Packages/INTEL.cmake b/cmake/Modules/Packages/INTEL.cmake
index fee86dc870..af08249090 100644
--- a/cmake/Modules/Packages/INTEL.cmake
+++ b/cmake/Modules/Packages/INTEL.cmake
@@ -3,7 +3,7 @@ if(NOT FOUND_IMMINTRIN)
   message(FATAL_ERROR "immintrin.h header not found, Intel package won't work without it")
 endif()
 
-target_compile_definitions(lammps PRIVATE -DLMP_USER_INTEL)
+target_compile_definitions(lammps PRIVATE -DLMP_INTEL)
 
 set(INTEL_ARCH "cpu" CACHE STRING "Architectures used by INTEL (cpu or knl)")
 set(INTEL_ARCH_VALUES cpu knl)
diff --git a/cmake/Modules/Packages/MDI.cmake b/cmake/Modules/Packages/MDI.cmake
index a75160a6d6..047c30c603 100644
--- a/cmake/Modules/Packages/MDI.cmake
+++ b/cmake/Modules/Packages/MDI.cmake
@@ -114,5 +114,5 @@ else()
   target_link_libraries(lmp PRIVATE ${mdi_LIBRARY})
 endif()
 
-target_compile_definitions(lammps PRIVATE -DLMP_USER_MDI)
-target_compile_definitions(lmp PRIVATE -DLMP_USER_MDI)
+target_compile_definitions(lammps PRIVATE -DLMP_MDI)
+target_compile_definitions(lmp PRIVATE -DLMP_MDI)
diff --git a/cmake/Modules/Packages/OPENMP.cmake b/cmake/Modules/Packages/OPENMP.cmake
index 0a23e58b4b..a69a81acec 100644
--- a/cmake/Modules/Packages/OPENMP.cmake
+++ b/cmake/Modules/Packages/OPENMP.cmake
@@ -5,7 +5,7 @@
                        ${OPENMP_SOURCES_DIR}/fix_nh_omp.cpp
                        ${OPENMP_SOURCES_DIR}/fix_nh_sphere_omp.cpp
                        ${OPENMP_SOURCES_DIR}/domain_omp.cpp)
-  target_compile_definitions(lammps PRIVATE -DLMP_USER_OMP)
+  target_compile_definitions(lammps PRIVATE -DLMP_OPENMP)
   set_property(GLOBAL PROPERTY "OMP_SOURCES" "${OPENMP_SOURCES}")
 
   # detects styles which have OPENMP version
diff --git a/src/INTEL/Install.sh b/src/INTEL/Install.sh
index 8c291f0ae2..94d967b194 100755
--- a/src/INTEL/Install.sh
+++ b/src/INTEL/Install.sh
@@ -56,7 +56,7 @@ if (test $mode = 1) then
 
   if (test -e ../Makefile.package) then
     sed -i -e 's/[^ \t]*INTEL[^ \t]* //' ../Makefile.package
-    sed -i -e 's|^PKG_INC =[ \t]*|&-DLMP_USER_INTEL |' ../Makefile.package
+    sed -i -e 's|^PKG_INC =[ \t]*|&-DLMP_INTEL |' ../Makefile.package
   fi
 
 elif (test $mode = 0) then
diff --git a/src/INTEL/intel_preprocess.h b/src/INTEL/intel_preprocess.h
index 9f4c78c9bc..27daa5f3d2 100644
--- a/src/INTEL/intel_preprocess.h
+++ b/src/INTEL/intel_preprocess.h
@@ -50,7 +50,7 @@
 #ifndef LMP_INTEL_PREPROCESS_H
 #define LMP_INTEL_PREPROCESS_H
 
-// LAMMPS_MEMALIGN is set to 64 by default for -DLMP_USER_INTEL
+// LAMMPS_MEMALIGN is set to 64 by default for -DLMP_INTEL
 // so we only need to error out in case of a different alignment
 #if LAMMPS_MEMALIGN && (LAMMPS_MEMALIGN != 64)
 #error Please set -DLAMMPS_MEMALIGN=64 in CCFLAGS of your LAMMPS makefile for INTEL package
diff --git a/src/MDI/Install.sh b/src/MDI/Install.sh
index 4f1ea6dfba..bc19162a17 100755
--- a/src/MDI/Install.sh
+++ b/src/MDI/Install.sh
@@ -40,7 +40,7 @@ if (test $1 = 1) then
     sed -i -e 's/[^ \t]*mdi[^ \t]* //g' ../Makefile.package
     sed -i -e 's|^PKG_INC =[ \t]*|&-I../../lib/mdi/includelink |' ../Makefile.package
     sed -i -e 's/[^ \t]*MDI[^ \t]* //' ../Makefile.package
-    sed -i -e 's|^PKG_INC =[ \t]*|&-DLMP_USER_MDI |' ../Makefile.package
+    sed -i -e 's|^PKG_INC =[ \t]*|&-DLMP_MDI |' ../Makefile.package
     sed -i -e 's|^PKG_PATH =[ \t]*|&-L../../lib/mdi/liblink |' ../Makefile.package
     sed -i -e 's|^PKG_LIB =[ \t]*|&-lmdi |' ../Makefile.package
     sed -i -e 's|^PKG_SYSINC =[ \t]*|&$(mdi_SYSINC) |' ../Makefile.package
diff --git a/src/OPENMP/Install.sh b/src/OPENMP/Install.sh
index 6d9423033e..1802f068e9 100755
--- a/src/OPENMP/Install.sh
+++ b/src/OPENMP/Install.sh
@@ -54,7 +54,7 @@ if (test $mode = 1) then
 
   if (test -e ../Makefile.package) then
     sed -i -e 's/[^ \t]*OMP[^ \t]* //' ../Makefile.package
-    sed -i -e 's|^PKG_INC =[ \t]*|&-DLMP_USER_OMP |' ../Makefile.package
+    sed -i -e 's|^PKG_INC =[ \t]*|&-DLMP_OPENMP |' ../Makefile.package
   fi
 
   # need to delete a bunch of dependency files because they
@@ -65,7 +65,7 @@ if (test $mode = 1) then
     rm -f ../Obj_*/$f
   done
 
-  # force rebuild of files with LMP_USER_OMP switch
+  # force rebuild of files with LMP_OPENMP switch
 
   touch ../accelerator_omp.h
 
@@ -83,7 +83,7 @@ elif (test $mode = 0) then
     rm -f ../Obj_*/$f
   done
 
-  # force rebuild of files with LMP_USER_OMP switch
+  # force rebuild of files with LMP_OPENMP switch
 
   touch ../accelerator_omp.h
 
diff --git a/src/accelerator_omp.h b/src/accelerator_omp.h
index 437ce3e413..0a85816684 100644
--- a/src/accelerator_omp.h
+++ b/src/accelerator_omp.h
@@ -13,7 +13,7 @@
 
 // NOTE: this file is *supposed* to be included multiple times
 
-#ifdef LMP_USER_OMP
+#ifdef LMP_OPENMP
 
 // true interface to OPENMP
 
@@ -41,4 +41,4 @@ class DomainOMP : public Domain {
 
 #endif /* LMP_DOMAIN_OMP_H */
 
-#endif /* !LMP_USER_OMP */
+#endif /* !LMP_OPENMP */
diff --git a/src/atom.cpp b/src/atom.cpp
index 6063398f40..0a629e2fe6 100644
--- a/src/atom.cpp
+++ b/src/atom.cpp
@@ -38,7 +38,7 @@
 #include <cmath>
 #include <cstring>
 
-#ifdef LMP_USER_INTEL
+#ifdef LMP_INTEL
 #include "neigh_request.h"
 #endif
 
@@ -2196,7 +2196,7 @@ void Atom::setup_sort_bins()
   bininvy = nbiny / (bboxhi[1]-bboxlo[1]);
   bininvz = nbinz / (bboxhi[2]-bboxlo[2]);
 
-#ifdef LMP_USER_INTEL
+#ifdef LMP_INTEL
   int intel_neigh = 0;
   if (neighbor->nrequest) {
     if (neighbor->requests[0]->intel) intel_neigh = 1;
diff --git a/src/finish.cpp b/src/finish.cpp
index 210b48dcb7..81ba59c1df 100644
--- a/src/finish.cpp
+++ b/src/finish.cpp
@@ -34,7 +34,7 @@
 #include <cmath>
 #include <cstring>
 
-#ifdef LMP_USER_OMP
+#ifdef LMP_OPENMP
 #include "modify.h"
 #include "fix_omp.h"
 #include "thr_data.h"
@@ -48,7 +48,7 @@ static void mpi_timings(const char *label, Timer *t, enum Timer::ttype tt,
                         MPI_Comm world, const int nprocs, const int nthreads,
                         const int me, double time_loop, FILE *scr, FILE *log);
 
-#ifdef LMP_USER_OMP
+#ifdef LMP_OPENMP
 static void omp_times(FixOMP *fix, const char *label, enum Timer::ttype which,
                       const int nthreads,FILE *scr, FILE *log);
 #endif
@@ -363,7 +363,7 @@ void Finish::end(int flag)
     }
   }
 
-#ifdef LMP_USER_OMP
+#ifdef LMP_OPENMP
   int ifix = modify->find_fix("package_omp");
 
   // print thread breakdown only with full timer detail
@@ -691,7 +691,7 @@ void mpi_timings(const char *label, Timer *t, enum Timer::ttype tt,
 
 /* ---------------------------------------------------------------------- */
 
-#ifdef LMP_USER_OMP
+#ifdef LMP_OPENMP
 void omp_times(FixOMP *fix, const char *label, enum Timer::ttype which,
                       const int nthreads,FILE *scr, FILE *log)
 {
diff --git a/src/info.cpp b/src/info.cpp
index 6756c174ca..7c0eb572db 100644
--- a/src/info.cpp
+++ b/src/info.cpp
@@ -1222,7 +1222,7 @@ bool Info::has_accelerator_feature(const std::string &package,
     return lmp_gpu_config(category,setting);
   }
 #endif
-#if defined(LMP_USER_OMP)
+#if defined(LMP_OPENMP)
   if (package == "OPENMP") {
     if (category == "precision") {
       if (setting == "double") return true;
@@ -1238,7 +1238,7 @@ bool Info::has_accelerator_feature(const std::string &package,
     }
   }
 #endif
-#if defined(LMP_USER_INTEL)
+#if defined(LMP_INTEL)
   if (package == "INTEL") {
     if (category == "precision") {
       if (setting == "double") return true;
diff --git a/src/lammps.cpp b/src/lammps.cpp
index 70174b9d14..5820a625d2 100644
--- a/src/lammps.cpp
+++ b/src/lammps.cpp
@@ -798,7 +798,7 @@ void LAMMPS::create()
   else neighbor = new Neighbor(this);
 
   if (kokkos) domain = new DomainKokkos(this);
-#ifdef LMP_USER_OMP
+#ifdef LMP_OPENMP
   else domain = new DomainOMP(this);
 #else
   else domain = new Domain(this);
diff --git a/src/main.cpp b/src/main.cpp
index 76ae4fde09..d65247c224 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -31,7 +31,7 @@
 #endif
 
 // import MolSSI Driver Interface library
-#if defined(LMP_USER_MDI)
+#if defined(LMP_MDI)
 #include <mdi.h>
 #endif
 
@@ -47,7 +47,7 @@ int main(int argc, char **argv)
 
   MPI_Comm lammps_comm = MPI_COMM_WORLD;
 
-#if defined(LMP_USER_MDI)
+#if defined(LMP_MDI)
   // initialize MDI interface, if compiled in
 
   int mdi_flag;
diff --git a/src/memory.cpp b/src/memory.cpp
index 8f7faad545..2a053e3dbd 100644
--- a/src/memory.cpp
+++ b/src/memory.cpp
@@ -16,7 +16,7 @@
 
 #include "error.h"
 
-#if defined(LMP_USER_INTEL) && \
+#if defined(LMP_INTEL) && \
   ((defined(__INTEL_COMPILER) || defined(__INTEL_LLVM_COMPILER)))
 #ifndef LMP_INTEL_NO_TBB
 #define LMP_USE_TBB_ALLOCATOR
@@ -31,7 +31,7 @@
 #endif
 #endif
 
-#if defined(LMP_USER_INTEL) && !defined(LAMMPS_MEMALIGN) && !defined(_WIN32)
+#if defined(LMP_INTEL) && !defined(LAMMPS_MEMALIGN) && !defined(_WIN32)
 #define LAMMPS_MEMALIGN 64
 #endif
 
diff --git a/src/my_page.cpp b/src/my_page.cpp
index 7cbaca2ef7..efad82d3d6 100644
--- a/src/my_page.cpp
+++ b/src/my_page.cpp
@@ -16,7 +16,7 @@
 
 #include <cstdlib>
 
-#if defined(LMP_USER_INTEL) && !defined(LAMMPS_MEMALIGN) && !defined(_WIN32)
+#if defined(LMP_INTEL) && !defined(LAMMPS_MEMALIGN) && !defined(_WIN32)
 #define LAMMPS_MEMALIGN 64
 #endif
 
diff --git a/src/my_pool_chunk.cpp b/src/my_pool_chunk.cpp
index 1c770d0208..484a4b3fcf 100644
--- a/src/my_pool_chunk.cpp
+++ b/src/my_pool_chunk.cpp
@@ -16,7 +16,7 @@
 
 #include <cstdlib>
 
-#if defined(LMP_USER_INTEL) && !defined(LAMMPS_MEMALIGN) && !defined(_WIN32)
+#if defined(LMP_INTEL) && !defined(LAMMPS_MEMALIGN) && !defined(_WIN32)
 #define LAMMPS_MEMALIGN 64
 #endif