diff --git a/src/OPENMP/angle_lepton_omp.cpp b/src/OPENMP/angle_lepton_omp.cpp
index f9a6c6790b..7e86a9e9bb 100644
--- a/src/OPENMP/angle_lepton_omp.cpp
+++ b/src/OPENMP/angle_lepton_omp.cpp
@@ -24,7 +24,7 @@
 
 #include <cmath>
 
-#include "LMP_Lepton.h"
+#include "Lepton.h"
 #include "lepton_utils.h"
 #include "omp_compat.h"
 using namespace LAMMPS_NS;
@@ -89,11 +89,11 @@ void AngleLeptonOMP::compute(int eflag, int vflag)
 template <int EVFLAG, int EFLAG, int NEWTON_BOND>
 void AngleLeptonOMP::eval(int nfrom, int nto, ThrData *const thr)
 {
-  std::vector<LMP_Lepton::CompiledExpression> angleforce;
-  std::vector<LMP_Lepton::CompiledExpression> anglepot;
+  std::vector<Lepton::CompiledExpression> angleforce;
+  std::vector<Lepton::CompiledExpression> anglepot;
   try {
     for (const auto &expr : expressions) {
-      auto parsed = LMP_Lepton::Parser::parse(LeptonUtils::substitute(expr, Pointers::lmp));
+      auto parsed = Lepton::Parser::parse(LeptonUtils::substitute(expr, Pointers::lmp));
       angleforce.emplace_back(parsed.differentiate("theta").createCompiledExpression());
       if (EFLAG) anglepot.emplace_back(parsed.createCompiledExpression());
     }
diff --git a/src/OPENMP/bond_lepton_omp.cpp b/src/OPENMP/bond_lepton_omp.cpp
index 4b578ee73c..0029062366 100644
--- a/src/OPENMP/bond_lepton_omp.cpp
+++ b/src/OPENMP/bond_lepton_omp.cpp
@@ -24,7 +24,7 @@
 
 #include <cmath>
 
-#include "LMP_Lepton.h"
+#include "Lepton.h"
 #include "lepton_utils.h"
 #include "omp_compat.h"
 using namespace LAMMPS_NS;
@@ -87,11 +87,11 @@ void BondLeptonOMP::compute(int eflag, int vflag)
 template <int EVFLAG, int EFLAG, int NEWTON_BOND>
 void BondLeptonOMP::eval(int nfrom, int nto, ThrData *const thr)
 {
-  std::vector<LMP_Lepton::CompiledExpression> bondforce;
-  std::vector<LMP_Lepton::CompiledExpression> bondpot;
+  std::vector<Lepton::CompiledExpression> bondforce;
+  std::vector<Lepton::CompiledExpression> bondpot;
   try {
     for (const auto &expr : expressions) {
-      auto parsed = LMP_Lepton::Parser::parse(LeptonUtils::substitute(expr, Pointers::lmp));
+      auto parsed = Lepton::Parser::parse(LeptonUtils::substitute(expr, Pointers::lmp));
       bondforce.emplace_back(parsed.differentiate("r").createCompiledExpression());
       if (EFLAG) bondpot.emplace_back(parsed.createCompiledExpression());
     }
diff --git a/src/OPENMP/dihedral_lepton_omp.cpp b/src/OPENMP/dihedral_lepton_omp.cpp
index 655d0807d4..13a1328058 100644
--- a/src/OPENMP/dihedral_lepton_omp.cpp
+++ b/src/OPENMP/dihedral_lepton_omp.cpp
@@ -25,7 +25,7 @@
 
 #include <cmath>
 
-#include "LMP_Lepton.h"
+#include "Lepton.h"
 #include "lepton_utils.h"
 #include "omp_compat.h"
 using namespace LAMMPS_NS;
@@ -92,11 +92,11 @@ void DihedralLeptonOMP::compute(int eflag, int vflag)
 template <int EVFLAG, int EFLAG, int NEWTON_BOND>
 void DihedralLeptonOMP::eval(int nfrom, int nto, ThrData *const thr)
 {
-  std::vector<LMP_Lepton::CompiledExpression> dihedralforce;
-  std::vector<LMP_Lepton::CompiledExpression> dihedralpot;
+  std::vector<Lepton::CompiledExpression> dihedralforce;
+  std::vector<Lepton::CompiledExpression> dihedralpot;
   try {
     for (const auto &expr : expressions) {
-      auto parsed = LMP_Lepton::Parser::parse(LeptonUtils::substitute(expr, Pointers::lmp));
+      auto parsed = Lepton::Parser::parse(LeptonUtils::substitute(expr, Pointers::lmp));
       dihedralforce.emplace_back(parsed.differentiate("phi").createCompiledExpression());
       if (EFLAG) dihedralpot.emplace_back(parsed.createCompiledExpression());
     }
diff --git a/src/OPENMP/pair_lepton_omp.cpp b/src/OPENMP/pair_lepton_omp.cpp
index ad10163747..2c96b63a7f 100644
--- a/src/OPENMP/pair_lepton_omp.cpp
+++ b/src/OPENMP/pair_lepton_omp.cpp
@@ -22,7 +22,7 @@
 
 #include <cmath>
 
-#include "LMP_Lepton.h"
+#include "Lepton.h"
 #include "lepton_utils.h"
 #include "omp_compat.h"
 using namespace LAMMPS_NS;
@@ -94,11 +94,11 @@ void PairLeptonOMP::eval(int iifrom, int iito, ThrData *const thr)
   const int *const *const firstneigh = list->firstneigh;
   double fxtmp, fytmp, fztmp;
 
-  std::vector<LMP_Lepton::CompiledExpression> pairforce;
-  std::vector<LMP_Lepton::CompiledExpression> pairpot;
+  std::vector<Lepton::CompiledExpression> pairforce;
+  std::vector<Lepton::CompiledExpression> pairpot;
   try {
     for (const auto &expr : expressions) {
-      auto parsed = LMP_Lepton::Parser::parse(LeptonUtils::substitute(expr, Pointers::lmp));
+      auto parsed = Lepton::Parser::parse(LeptonUtils::substitute(expr, Pointers::lmp));
       pairforce.emplace_back(parsed.differentiate("r").createCompiledExpression());
       if (EFLAG) pairpot.emplace_back(parsed.createCompiledExpression());
     }