diff --git a/corsika/detail/modules/pythia8/Decay.inl b/corsika/detail/modules/pythia8/Decay.inl
index a8315ee821e4a56c88b9759d7db38a5eed3ab525..08f9940915791a54fae3538c9effcc56070ae1fa 100644
--- a/corsika/detail/modules/pythia8/Decay.inl
+++ b/corsika/detail/modules/pythia8/Decay.inl
@@ -100,7 +100,7 @@ namespace corsika::pythia8 {
     double py = pcomp[1] / 1_GeV;
     double pz = pcomp[2] / 1_GeV;
     double en = vP.GetEnergy() / 1_GeV;
-    double m = corsika::mass(vP.GetPID()) / 1_GeV;
+    double m = corsika::get_mass(vP.GetPID()) / 1_GeV;
 
     // add particle to pythia stack
     event.append(pdgCode, 1, 0, 0, px, py, pz, en, m);
diff --git a/corsika/detail/modules/qgsjetII/Interaction.inl b/corsika/detail/modules/qgsjetII/Interaction.inl
index 2acf1e55d16b73386d28132a7035d6b7a8af6174..e384bcd6fa5fd657da13a251efeee981465fb40c 100644
--- a/corsika/detail/modules/qgsjetII/Interaction.inl
+++ b/corsika/detail/modules/qgsjetII/Interaction.inl
@@ -295,7 +295,7 @@ namespace corsika::qgsjetII {
                                      (projectileEnergyLab - corsika::Proton::mass))});
 
             auto const energy =
-                sqrt(momentum.squaredNorm() + square(corsika::mass(idFragm)));
+                sqrt(momentum.squaredNorm() + square(corsika::get_mass(idFragm)));
             momentum.rebase(originalCS); // transform back into standard lab frame
             std::cout << "secondary fragment> id=" << idFragm
                       << " p=" << momentum.GetComponents() << std::endl;
diff --git a/corsika/detail/modules/sibyll/Decay.inl b/corsika/detail/modules/sibyll/Decay.inl
index eff18c5408e16e3ffa629ad2591cf82f28a6ddd6..ae4e738e2edeb4403f1cdf4eb72cced52f431063 100644
--- a/corsika/detail/modules/sibyll/Decay.inl
+++ b/corsika/detail/modules/sibyll/Decay.inl
@@ -123,7 +123,7 @@ namespace corsika::sibyll {
                    vP.GetMomentum(),
                    // setting particle mass with Corsika values, may be inconsistent
                    // with sibyll internal values
-                   corsika::mass(pCode));
+                   corsika::get_mass(pCode));
     // remember position
     Point const decayPoint = vP.GetPosition();
     TimeType const t0 = vP.GetTime();
diff --git a/corsika/detail/modules/sibyll/NuclearInteraction.inl b/corsika/detail/modules/sibyll/NuclearInteraction.inl
index d4399233c023f31f021f46361031d3b5f3aa1a36..37daa68f335cb22c84fe33d79a5ce9608ec37598 100644
--- a/corsika/detail/modules/sibyll/NuclearInteraction.inl
+++ b/corsika/detail/modules/sibyll/NuclearInteraction.inl
@@ -560,7 +560,7 @@ namespace corsika::sibyll {
       // CORSIKA 7 way
       // elastic nucleons inherit momentum from original projectile
       // neglecting momentum transfer in interaction
-      const double mass_ratio = corsika::mass(elaNucCode) / ProjMass;
+      const double mass_ratio = corsika::get_mass(elaNucCode) / ProjMass;
       auto const Plab = PprojLab * mass_ratio;
 
       vP.AddSecondary(std::tuple<corsika::Code, si::HEPEnergyType,
diff --git a/corsika/detail/modules/urqmd/UrQMD.inl b/corsika/detail/modules/urqmd/UrQMD.inl
index f292ccce9ea505121245ef2887d5facc02934565..3539f0f301676713a90a89d06593f71da011463b 100644
--- a/corsika/detail/modules/urqmd/UrQMD.inl
+++ b/corsika/detail/modules/urqmd/UrQMD.inl
@@ -39,8 +39,8 @@ namespace corsika::urqmd {
     // the following is a translation of ptsigtot() into C++
     if (vProjectileCode != corsika::Code::Nucleus &&
         !corsika::is_nucleus(vTargetCode)) { // both particles are "special"
-      auto const mProj = corsika::mass(vProjectileCode);
-      auto const mTar = corsika::mass(vTargetCode);
+      auto const mProj = corsika::get_mass(vProjectileCode);
+      auto const mTar = corsika::get_mass(vTargetCode);
       double sqrtS =
           sqrt(static_pow<2>(mProj) + static_pow<2>(mTar) + 2 * vLabEnergy * mTar) *
           (1 / 1_GeV);
@@ -226,7 +226,7 @@ namespace corsika::urqmd {
               ::urqmd::coor_.px[i], ::urqmd::coor_.py[i], ::urqmd::coor_.pz[i]} *
               1_GeV);
 
-      auto const energy = sqrt(momentum.squaredNorm() + square(corsika::mass(code)));
+      auto const energy = sqrt(momentum.squaredNorm() + square(corsika::get_mass(code)));
 
       momentum.rebase(originalCS); // transform back into standard lab frame
       std::cout << i << " " << code << " " << momentum.GetComponents() << std::endl;