diff --git a/Core/include/Acts/Fitter/KalmanFitter.hpp b/Core/include/Acts/Fitter/KalmanFitter.hpp
index dfc7535da0f8305109b83f6e32cc7a7c332b563a..85384b4a21b579b8b3ac7187d4c4e527419250b9 100644
--- a/Core/include/Acts/Fitter/KalmanFitter.hpp
+++ b/Core/include/Acts/Fitter/KalmanFitter.hpp
@@ -49,10 +49,10 @@ namespace Acts {
 template <typename outlier_finder_t = VoidOutlierFinder>
 struct KalmanFitterOptions {
   // Broadcast the outlier finder type
-  using OutlierFinderType = outlier_finder_t;
+  using OutlierFinder = outlier_finder_t;
 
   // Broadcast the outlier finder config type
-  using OutlierFinderConfigType = typename OutlierFinderType::Config;
+  using OutlierFinderConfig = typename OutlierFinder::Config;
 
   /// Deleted default constructor
   KalmanFitterOptions() = delete;
@@ -70,7 +70,7 @@ struct KalmanFitterOptions {
   KalmanFitterOptions(std::reference_wrapper<const GeometryContext> gctx,
                       std::reference_wrapper<const MagneticFieldContext> mctx,
                       std::reference_wrapper<const CalibrationContext> cctx,
-                      const OutlierFinderConfigType& ofCfg,
+                      const OutlierFinderConfig& ofCfg,
                       const Surface* rSurface = nullptr,
                       bool mScattering = true, bool eLoss = true,
                       bool bwdFiltering = false)
@@ -91,7 +91,7 @@ struct KalmanFitterOptions {
   std::reference_wrapper<const CalibrationContext> calibrationContext;
 
   /// The config for the outlier finder
-  OutlierFinderConfigType outlierFinderConfig;
+  OutlierFinderConfig outlierFinderConfig;
 
   /// The reference Surface
   const Surface* referenceSurface = nullptr;
@@ -927,9 +927,8 @@ class KalmanFitter {
                   "Source link does not fulfill SourceLinkConcept");
 
     static_assert(
-        std::is_same<
-            outlier_finder_t,
-            typename kalman_fitter_options_t::OutlierFinderType>::value,
+        std::is_same<outlier_finder_t,
+                     typename kalman_fitter_options_t::OutlierFinder>::value,
         "Inconsistent type of outlier finder between kalman fitter and "
         "kalman fitter options");
 
@@ -1027,9 +1026,8 @@ class KalmanFitter {
                   "Source link does not fulfill SourceLinkConcept");
 
     static_assert(
-        std::is_same<
-            outlier_finder_t,
-            typename kalman_fitter_options_t::OutlierFinderType>::value,
+        std::is_same<outlier_finder_t,
+                     typename kalman_fitter_options_t::OutlierFinder>::value,
         "Inconsistent type of outlier finder between kalman fitter and "
         "kalman fitter options");
 
diff --git a/Core/include/Acts/Fitter/detail/VoidKalmanComponents.hpp b/Core/include/Acts/Fitter/detail/VoidKalmanComponents.hpp
index c89b661cbad736cb0af2ca72f705429246d8460d..555770f00192de3a0b63fe21a0ca3efd236f75eb 100644
--- a/Core/include/Acts/Fitter/detail/VoidKalmanComponents.hpp
+++ b/Core/include/Acts/Fitter/detail/VoidKalmanComponents.hpp
@@ -115,8 +115,8 @@ struct VoidOutlierFinder {
   /// @brief nested config struct
   ///
   struct Config {
-    // Allowed maximum chi2
-    double maxChi2 = std::numeric_limits<double>::max();
+    // Allowed chi2 cut-off
+    double chi2Cutoff = std::numeric_limits<double>::max();
   };
   /// @brief Public call mimicking an outlier finder
   ///
@@ -127,7 +127,7 @@ struct VoidOutlierFinder {
   /// @return Whether it's outlier or not
   template <typename track_state_t>
   bool operator()(const track_state_t& trackState) const {
-    if (trackState.chi2 > m_config.maxChi2) {
+    if (trackState.chi2 > m_config.chi2Cutoff) {
       return true;
     }
     return false;
diff --git a/Tests/UnitTests/Core/Fitter/KalmanFitterTests.cpp b/Tests/UnitTests/Core/Fitter/KalmanFitterTests.cpp
index b11d6d9f880e21e0ceb3535ebf4d19c1060c6206..a4de59bee611a3bacec1b34d9597ce5d328591c2 100644
--- a/Tests/UnitTests/Core/Fitter/KalmanFitterTests.cpp
+++ b/Tests/UnitTests/Core/Fitter/KalmanFitterTests.cpp
@@ -225,7 +225,7 @@ struct MinimalOutlierFinder {
   ///
   struct Config {
     /// The measurement significance criteria
-    double measurementSignificance = 0;
+    double measurementSignificanceCutoff = 0;
 
     /// The chi2 round-off error
     double chi2Tolerance = 10e-5;
@@ -251,7 +251,7 @@ struct MinimalOutlierFinder {
     // The p-Value
     double pValue = 1 - boost::math::cdf(chiDist, chi2);
     // If pValue is NOT significant enough => outlier
-    return pValue > m_config.measurementSignificance ? false : true;
+    return pValue > m_config.measurementSignificanceCutoff ? false : true;
   }
 
   /// The config
@@ -375,7 +375,7 @@ BOOST_AUTO_TEST_CASE(kalman_fitter_zero_field) {
 
   using OutlierFinderConfig = typename MinimalOutlierFinder::Config;
   OutlierFinderConfig ofConfig;
-  ofConfig.measurementSignificance = 0.05;
+  ofConfig.measurementSignificanceCutoff = 0.05;
 
   KalmanFitter kFitter(rPropagator,
                        getDefaultLogger("KalmanFilter", Logging::VERBOSE));