diff --git a/corsika/detail/framework/core/Cascade.inl b/corsika/detail/framework/core/Cascade.inl
index 6fc0a88aa7a619643d44715cc23447b8768074db..841a9f6206ce9465ce42c71f29a7922ac5085d6f 100644
--- a/corsika/detail/framework/core/Cascade.inl
+++ b/corsika/detail/framework/core/Cascade.inl
@@ -106,7 +106,7 @@ namespace corsika {
 
     // convert next_step from grammage to length
     LengthType const distance_interact =
-        currentLogicalNode->GetModelProperties().ArclengthFromGrammage(step,
+        currentLogicalNode->GetModelProperties().arclengthFromGrammage(step,
                                                                        next_interact);
 
     // determine the maximum geometric step length
diff --git a/corsika/media/DensityFunction.hpp b/corsika/media/DensityFunction.hpp
index 8daf12dfa318d20eb24e5e33e73ba4246e0a7fd9..b22b54961a0aaa821227cc42edf5f803ac923866 100644
--- a/corsika/media/DensityFunction.hpp
+++ b/corsika/media/DensityFunction.hpp
@@ -21,13 +21,13 @@ namespace corsika {
       : public TIntegrator<DensityFunction<TDerivableRho, TIntegrator>> {
     friend class TIntegrator<DensityFunction<TDerivableRho, TIntegrator>>;
 
-    TDerivableRho fRho; //!< functor for density
+    TDerivableRho rho_; //!< functor for density
 
   public:
     DensityFunction(TDerivableRho rho)
-        : fRho(rho) {}
+        : rho_(rho) {}
 
-    MassDensityType EvaluateAt(corsika::Point const& p) const { return fRho(p); }
+    MassDensityType evaluateAt(corsika::Point const& p) const { return rho_(p); }
   };
 
 } // namespace corsika
diff --git a/corsika/media/LinearApproximationIntegrator.hpp b/corsika/media/LinearApproximationIntegrator.hpp
index ccacc9d601fdda516627fecbd6249c7fff55dc6c..ac49879dd38d54db4182af88b2c08cfa1dfad8a2 100644
--- a/corsika/media/LinearApproximationIntegrator.hpp
+++ b/corsika/media/LinearApproximationIntegrator.hpp
@@ -15,20 +15,19 @@
 
 namespace corsika {
 
-  template <class TDerived>
+  template <typename TDerived>
   class LinearApproximationIntegrator {
-
-    auto const& GetImplementation() const;
+    auto const& getImplementation() const;
 
   public:
-    inline auto IntegrateGrammage(corsika::Trajectory<corsika::Line> const& line,
-                                  LengthType length) const;
+    auto integrateGrammage(Trajectory<Line> const& line,
+                           units::si::LengthType length) const;
 
-    inline auto ArclengthFromGrammage(corsika::Trajectory<corsika::Line> const& line,
-                                      GrammageType grammage) const;
+    auto arclengthFromGrammage(Trajectory<Line> const& line,
+                               units::si::GrammageType grammage) const;
 
-    inline auto MaximumLength(corsika::Trajectory<corsika::Line> const& line,
-                              [[maybe_unused]] double relError) const;
+    auto maximumLength(Trajectory<Line> const& line,
+                       [[maybe_unused]] double relError) const;
   };
 
 } // namespace corsika