diff --git a/corsika/detail/modules/ObservationPlane.inl b/corsika/detail/modules/ObservationPlane.inl
index ff998e0aaed15f01b449aad56dffdd9b76a2665b..a63fc35884668b150458ef38b0ae4316661d2f63 100644
--- a/corsika/detail/modules/ObservationPlane.inl
+++ b/corsika/detail/modules/ObservationPlane.inl
@@ -35,7 +35,7 @@ namespace corsika::observation_plane {
       return corsika::EProcessReturn::eOk;
     }
 
-    outputStream_ << static_cast<int>(corsika::PDG(particle.GetPID())) << ' '
+    outputStream_ << static_cast<int>(corsika::get_PDG(particle.GetPID())) << ' '
                   << particle.GetEnergy() * (1 / 1_eV) << ' '
                   << (trajectory.GetPosition(1) - plane_.GetCenter()).norm() / 1_m
                   << std::endl;
diff --git a/corsika/detail/modules/TrackWriter.inl b/corsika/detail/modules/TrackWriter.inl
index e9f232a49466c3a519a486ad00a6e1be553d47a4..bb6cb9689b32fb175d15a9bcdfcc9f1e92ee6451 100644
--- a/corsika/detail/modules/TrackWriter.inl
+++ b/corsika/detail/modules/TrackWriter.inl
@@ -35,7 +35,7 @@ namespace corsika::track_writer {
                                                     const TTrack& vT) {
     auto const start = vT.GetPosition(0).GetCoordinates();
     auto const delta = vT.GetPosition(1).GetCoordinates() - start;
-    auto const pdg = static_cast<int>(corsika::PDG(vP.GetPID()));
+    auto const pdg = static_cast<int>(corsika::get_PDG(vP.GetPID()));
 
     // clang-format off
     fFile << std::setw(7) << pdg
diff --git a/corsika/detail/modules/pythia8/Decay.inl b/corsika/detail/modules/pythia8/Decay.inl
index 6352f2d88e537136da4506db1125ca2295023d57..a8315ee821e4a56c88b9759d7db38a5eed3ab525 100644
--- a/corsika/detail/modules/pythia8/Decay.inl
+++ b/corsika/detail/modules/pythia8/Decay.inl
@@ -50,12 +50,12 @@ namespace corsika::pythia8 {
 
   void Decay::SetUnstable(const corsika::Code pCode) {
     std::cout << "Pythia::Decay: setting " << pCode << " unstable.." << std::endl;
-    fPythia.particleData.mayDecay(static_cast<int>(corsika::PDG(pCode)), true);
+    fPythia.particleData.mayDecay(static_cast<int>(corsika::get_PDG(pCode)), true);
   }
 
   void Decay::SetStable(const corsika::Code pCode) {
     std::cout << "Pythia::Decay: setting " << pCode << " stable.." << std::endl;
-    fPythia.particleData.mayDecay(static_cast<int>(corsika::PDG(pCode)), false);
+    fPythia.particleData.mayDecay(static_cast<int>(corsika::get_PDG(pCode)), false);
   }
 
   template <typename TParticle>
@@ -93,7 +93,7 @@ namespace corsika::pythia8 {
     Decay::SetUnstable(vP.GetPID());
 
     // input particle PDG
-    auto const pdgCode = static_cast<int>(corsika::PDG(vP.GetPID()));
+    auto const pdgCode = static_cast<int>(corsika::get_PDG(vP.GetPID()));
 
     auto const pcomp = vP.GetMomentum().GetComponents();
     double px = pcomp[0] / 1_GeV;
diff --git a/corsika/detail/modules/pythia8/Interaction.inl b/corsika/detail/modules/pythia8/Interaction.inl
index 65fa5de07df6c2050adedc2bf062623fcab51513..dd92d06a68f4c0ef0f113cce95c7e933683a9477 100644
--- a/corsika/detail/modules/pythia8/Interaction.inl
+++ b/corsika/detail/modules/pythia8/Interaction.inl
@@ -77,12 +77,12 @@ namespace corsika::pythia8 {
 
   void Interaction::SetUnstable(const corsika::Code pCode) {
     std::cout << "Pythia::Interaction: setting " << pCode << " unstable.." << std::endl;
-    fPythia.particleData.mayDecay(static_cast<int>(corsika::PDG(pCode)), true);
+    fPythia.particleData.mayDecay(static_cast<int>(corsika::get_PDG(pCode)), true);
   }
 
   void Interaction::SetStable(const corsika::Code pCode) {
     std::cout << "Pythia::Interaction: setting " << pCode << " stable.." << std::endl;
-    fPythia.particleData.mayDecay(static_cast<int>(corsika::PDG(pCode)), false);
+    fPythia.particleData.mayDecay(static_cast<int>(corsika::get_PDG(pCode)), false);
   }
 
   void Interaction::ConfigureLabFrameCollision(const corsika::Code BeamId,
@@ -93,15 +93,15 @@ namespace corsika::pythia8 {
 
     // set beam
     // beam id for pythia
-    auto const pdgBeam = static_cast<int>(corsika::PDG(BeamId));
+    auto const pdgBeam = static_cast<int>(corsika::get_PDG(BeamId));
     std::stringstream stBeam;
     stBeam << "Beams:idA = " << pdgBeam;
     fPythia.readString(stBeam.str());
     // set target
-    auto pdgTarget = static_cast<int>(corsika::PDG(TargetId));
+    auto pdgTarget = static_cast<int>(corsika::get_PDG(TargetId));
     // replace hydrogen with proton, otherwise pythia goes into heavy ion mode!
     if (TargetId == corsika::Code::Hydrogen)
-      pdgTarget = static_cast<int>(corsika::PDG(corsika::Code::Proton));
+      pdgTarget = static_cast<int>(corsika::get_PDG(corsika::Code::Proton));
     std::stringstream stTarget;
     stTarget << "Beams:idB = " << pdgTarget;
     fPythia.readString(stTarget.str());
@@ -131,8 +131,8 @@ namespace corsika::pythia8 {
     if (TargetId == corsika::Code::Proton || TargetId == corsika::Code::Hydrogen) {
       if (CanInteract(BeamId) && ValidCoMEnergy(CoMenergy)) {
         // input particle PDG
-        auto const pdgCodeBeam = static_cast<int>(corsika::PDG(BeamId));
-        auto const pdgCodeTarget = static_cast<int>(corsika::PDG(TargetId));
+        auto const pdgCodeBeam = static_cast<int>(corsika::get_PDG(BeamId));
+        auto const pdgCodeTarget = static_cast<int>(corsika::get_PDG(TargetId));
         const double ecm = CoMenergy / 1_GeV;
 
         // calculate cross section
diff --git a/corsika/detail/modules/urqmd/UrQMD.inl b/corsika/detail/modules/urqmd/UrQMD.inl
index 558b44d74278fc601159a987443bb726e7ae22ad..f292ccce9ea505121245ef2887d5facc02934565 100644
--- a/corsika/detail/modules/urqmd/UrQMD.inl
+++ b/corsika/detail/modules/urqmd/UrQMD.inl
@@ -310,7 +310,7 @@ namespace corsika::urqmd {
         {443, {135, 0}},     // jpsi
     };
 
-    return mapPDGToUrQMD.at(static_cast<int>(PDG(code)));
+    return mapPDGToUrQMD.at(static_cast<int>(get_PDG(code)));
   }
 
 } // namespace corsika::urqmd