diff --git a/examples/boundary_example.cpp b/examples/boundary_example.cpp
index e19c8c9560b72b7e0d652a0432e1d8d06e5f7c83..a7c595c04be2b054b95211e287bda5516913b359 100644
--- a/examples/boundary_example.cpp
+++ b/examples/boundary_example.cpp
@@ -46,7 +46,7 @@ struct MyBoundaryCrossingProcess
                                     typename Particle::BaseNodeType const& to) {
     std::cout << "boundary crossing! from: " << &from << "; to: " << &to << std::endl;
 
-    auto const& name = corsika::GetName(p.GetPID());
+    auto const& name = corsika::name(p.GetPID());
     auto const start = p.GetPosition().GetCoordinates();
 
     fFile << name << "    " << start[0] / 1_m << ' ' << start[1] / 1_m << ' '
@@ -116,7 +116,7 @@ int main() {
   setup::Stack stack;
   stack.Clear();
   const Code beamCode = Code::Proton;
-  const HEPMassType mass = corsika::GetMass(Code::Proton);
+  const HEPMassType mass = corsika::mass(Code::Proton);
   const HEPEnergyType E0 = 50_TeV;
 
   std::uniform_real_distribution distTheta(0., 180.);
diff --git a/examples/cascade_example.cpp b/examples/cascade_example.cpp
index 07a1d8e205e923bc455574600a53197cb1139fc3..58e9ee720922ac8118bcd275b4f1602c9d3f8b63 100644
--- a/examples/cascade_example.cpp
+++ b/examples/cascade_example.cpp
@@ -81,7 +81,7 @@ int main() {
   const Code beamCode = Code::Nucleus;
   const int nuclA = 4;
   const int nuclZ = int(nuclA / 2.15 + 0.7);
-  const HEPMassType mass = GetNucleusMass(nuclA, nuclZ);
+  const HEPMassType mass = nucleus_mass(nuclA, nuclZ);
   const HEPEnergyType E0 = nuclA * 1_TeV;
   double theta = 0.;
   double phi = 0.;
diff --git a/examples/cascade_proton_example.cpp b/examples/cascade_proton_example.cpp
index 729f4a7f7ce14f8f33ae0d06f7a940df23f54ac3..8bcc7668b0b0524e1390520f53076b7ac85b0b32 100644
--- a/examples/cascade_proton_example.cpp
+++ b/examples/cascade_proton_example.cpp
@@ -69,7 +69,7 @@ int main() {
   setup::Stack stack;
   stack.Clear();
   const Code beamCode = Code::Proton;
-  const HEPMassType mass = corsika::Proton::GetMass();
+  const HEPMassType mass = corsika::mass(beamCode);
   const HEPEnergyType E0 = 100_GeV;
   double theta = 0.;
   double phi = 0.;
diff --git a/examples/stopping_power.cpp b/examples/stopping_power.cpp
index f2e034d3d0ce911585ed7f6424295db8a17f5b12..5792af98d4444dde5cb83428f0e6383845da4f60 100644
--- a/examples/stopping_power.cpp
+++ b/examples/stopping_power.cpp
@@ -52,7 +52,7 @@ int main() {
   for (HEPEnergyType E0 = 300_MeV; E0 < 1_PeV; E0 *= 1.05) {
     stack.Clear();
     const Code beamCode = Code::MuPlus;
-    const HEPMassType mass = GetMass(beamCode);
+    const HEPMassType mass = corsika::mass(beamCode);
     double theta = 0.;
     double phi = 0.;
 
diff --git a/examples/vertical_EAS.cpp b/examples/vertical_EAS.cpp
index 5ec62fec732a2d2eb138a9382668c74ffaa5baf9..53ce463bd157633d8995aad14ed45443e20b6798 100644
--- a/examples/vertical_EAS.cpp
+++ b/examples/vertical_EAS.cpp
@@ -77,7 +77,7 @@ int main() {
   setup::Stack stack;
   stack.Clear();
   const Code beamCode = Code::Proton;
-  auto const mass = corsika::GetMass(beamCode);
+  auto const mass = corsika::mass(beamCode);
   const HEPEnergyType E0 = 0.1_PeV;
   double theta = 0.;
   double phi = 0.;