diff --git a/Core/Computation/SpecularComputation.cpp b/Core/Computation/SpecularComputation.cpp
index e3612e9aeb7754f60417e638f902f057a99f2615..b58d9a82e0139ccfa5c605491562c10bb82c6d76 100644
--- a/Core/Computation/SpecularComputation.cpp
+++ b/Core/Computation/SpecularComputation.cpp
@@ -17,8 +17,8 @@
 #include "Core/Element/SpecularElement.h"
 #include "Resample/Flux/IFlux.h"
 #include "Resample/Processed/ProcessedSample.h"
-#include "Resample/Specular/SpecularMagneticStrategy.h"
-#include "Resample/Specular/SpecularScalarStrategy.h"
+#include "Resample/Specular/ComputeFluxMagnetic.h"
+#include "Resample/Specular/ComputeFluxScalar.h"
 #include "Sample/Multilayer/MultiLayer.h"
 
 SpecularComputation::SpecularComputation(const ProcessedSample& re_sample,
diff --git a/Resample/Processed/ProcessedSample.cpp b/Resample/Processed/ProcessedSample.cpp
index 95a6854c2fd61ee1fc20efc9cff4dcef97d00cbc..ba03ed75c86d06db1169fff8dfd2dcf317f36e5d 100644
--- a/Resample/Processed/ProcessedSample.cpp
+++ b/Resample/Processed/ProcessedSample.cpp
@@ -20,8 +20,8 @@
 #include "Resample/Processed/ProcessedLayout.h"
 #include "Resample/Slice/Slice.h"
 #include "Resample/Slice/SliceStack.h"
-#include "Resample/Specular/SpecularMagneticStrategy.h"
-#include "Resample/Specular/SpecularScalarStrategy.h"
+#include "Resample/Specular/ComputeFluxMagnetic.h"
+#include "Resample/Specular/ComputeFluxScalar.h"
 #include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Material/Admixtures.h"
 #include "Sample/Material/MaterialBySLDImpl.h"
@@ -308,7 +308,7 @@ Fluxes ProcessedSample::fluxesOut(const kvector_t& k) const
 {
     if (m_polarized)
         return Compute::SpecularMagnetic::fluxes(m_reversed_stack, -k);
-    return Compute::SpecularScalar::fluxes(m_reversed_stack, -k);
+    return Compute::SpecularScalar::fluxes(m_refined_stack, -k);
 }
 
 double ProcessedSample::crossCorrSpectralFun(const kvector_t kvec, size_t j, size_t k) const
diff --git a/Resample/Specular/SpecularMagneticStrategy.cpp b/Resample/Specular/ComputeFluxMagnetic.cpp
similarity index 98%
rename from Resample/Specular/SpecularMagneticStrategy.cpp
rename to Resample/Specular/ComputeFluxMagnetic.cpp
index c624b94d7a303bc8d3400a39e520bbcbfb65d852..95f807a94bd4136cdd18e13525975205b4b64d5e 100644
--- a/Resample/Specular/SpecularMagneticStrategy.cpp
+++ b/Resample/Specular/ComputeFluxMagnetic.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Resample/Specular/SpecularMagneticStrategy.cpp
+//! @file      Resample/Specular/ComputeFluxMagnetic.cpp
 //! @brief     Implements class SpecularMagneticStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Resample/Specular/SpecularMagneticStrategy.h"
+#include "Resample/Specular/ComputeFluxMagnetic.h"
 #include "Base/Const/PhysicalConstants.h"
 #include "Base/Utils/Assert.h"
 #include "Resample/Flux/MatrixFlux.h"
diff --git a/Resample/Specular/SpecularMagneticStrategy.h b/Resample/Specular/ComputeFluxMagnetic.h
similarity index 87%
rename from Resample/Specular/SpecularMagneticStrategy.h
rename to Resample/Specular/ComputeFluxMagnetic.h
index 730c5913a963bbce2e56854c4d0dd20920da9dab..b901d8a1567e1109b19da057f3589829c53ae6f8 100644
--- a/Resample/Specular/SpecularMagneticStrategy.h
+++ b/Resample/Specular/ComputeFluxMagnetic.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Resample/Specular/SpecularMagneticStrategy.h
+//! @file      Resample/Specular/ComputeFluxMagnetic.h
 //! @brief     Defines namespace Compute::SpecularMagnetic.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,8 +17,8 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_RESAMPLE_SPECULAR_SPECULARMAGNETICSTRATEGY_H
-#define BORNAGAIN_RESAMPLE_SPECULAR_SPECULARMAGNETICSTRATEGY_H
+#ifndef BORNAGAIN_RESAMPLE_SPECULAR_COMPUTEFLUXMAGNETIC_H
+#define BORNAGAIN_RESAMPLE_SPECULAR_COMPUTEFLUXMAGNETIC_H
 
 #include "Base/Vector/Vectors3D.h"
 #include "Sample/Multilayer/RoughnessModels.h"
@@ -49,5 +49,5 @@ Eigen::Matrix2cd topLayerR(const SliceStack& slices, const std::vector<complex_t
                            const RoughnessModel&);
 } // namespace Compute::SpecularMagnetic
 
-#endif // BORNAGAIN_RESAMPLE_SPECULAR_SPECULARMAGNETICSTRATEGY_H
+#endif // BORNAGAIN_RESAMPLE_SPECULAR_COMPUTEFLUXMAGNETIC_H
 #endif // USER_API
diff --git a/Resample/Specular/SpecularScalarStrategy.cpp b/Resample/Specular/ComputeFluxScalar.cpp
similarity index 98%
rename from Resample/Specular/SpecularScalarStrategy.cpp
rename to Resample/Specular/ComputeFluxScalar.cpp
index 785c72bf61913d825199a193379b2db83d4bd0a4..13b97f6389a5d6bdea3d5e6303340a991718914a 100644
--- a/Resample/Specular/SpecularScalarStrategy.cpp
+++ b/Resample/Specular/ComputeFluxScalar.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Resample/Specular/SpecularScalarStrategy.cpp
+//! @file      Resample/Specular/ComputeFluxScalar.cpp
 //! @brief     Implements class SpecularScalarStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Resample/Specular/SpecularScalarStrategy.h"
+#include "Resample/Specular/ComputeFluxScalar.h"
 #include "Base/Math/Constants.h"
 #include "Base/Math/Functions.h"
 #include "Base/Utils/Assert.h"
diff --git a/Resample/Specular/SpecularScalarStrategy.h b/Resample/Specular/ComputeFluxScalar.h
similarity index 86%
rename from Resample/Specular/SpecularScalarStrategy.h
rename to Resample/Specular/ComputeFluxScalar.h
index 8bd8356c57396eab830c52bca24f3d7511edcd12..5fd2459e0b67a7385a40413c40b2e811489ec047 100644
--- a/Resample/Specular/SpecularScalarStrategy.h
+++ b/Resample/Specular/ComputeFluxScalar.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Resample/Specular/SpecularScalarStrategy.h
+//! @file      Resample/Specular/ComputeFluxScalar.h
 //! @brief     Defines namespace Compute::SpecularScalar.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,8 +17,8 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_RESAMPLE_SPECULAR_SPECULARSCALARSTRATEGY_H
-#define BORNAGAIN_RESAMPLE_SPECULAR_SPECULARSCALARSTRATEGY_H
+#ifndef BORNAGAIN_RESAMPLE_SPECULAR_COMPUTEFLUXSCALAR_H
+#define BORNAGAIN_RESAMPLE_SPECULAR_COMPUTEFLUXSCALAR_H
 
 #include "Base/Vector/Vectors3D.h"
 #include "Sample/Multilayer/RoughnessModels.h"
@@ -44,5 +44,5 @@ complex_t topLayerR(const SliceStack& slices, const std::vector<complex_t>& kz,
 
 } // namespace Compute::SpecularScalar
 
-#endif // BORNAGAIN_RESAMPLE_SPECULAR_SPECULARSCALARSTRATEGY_H
+#endif // BORNAGAIN_RESAMPLE_SPECULAR_COMPUTEFLUXSCALAR_H
 #endif // USER_API
diff --git a/Tests/UnitTests/Core/Sample/RTTest.cpp b/Tests/UnitTests/Core/Sample/RTTest.cpp
index 27ed7166e1e594d0ccf74ff2e69c1f5cbfbc3ffc..1bc7a7e86220801551737e61202a72fe981f6793 100644
--- a/Tests/UnitTests/Core/Sample/RTTest.cpp
+++ b/Tests/UnitTests/Core/Sample/RTTest.cpp
@@ -2,7 +2,7 @@
 #include "Resample/Flux/ScalarFlux.h"
 #include "Resample/Options/SimulationOptions.h"
 #include "Resample/Processed/ProcessedSample.h"
-#include "Resample/Specular/SpecularScalarStrategy.h"
+#include "Resample/Specular/ComputeFluxScalar.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/Interface/LayerInterface.h"
 #include "Sample/Interface/LayerRoughness.h"
diff --git a/auto/Wrap/doxygenResample.i b/auto/Wrap/doxygenResample.i
index 4e20c4a41e30fa8d1f891230ce46b01c2ee2e1cd..1267a36889cefcae13dae7f20f62817115552062 100644
--- a/auto/Wrap/doxygenResample.i
+++ b/auto/Wrap/doxygenResample.i
@@ -939,16 +939,16 @@ Get default z limits for generating a material profile.
 // File: SliceStack_8h.xml
 
 
-// File: SpecularMagneticStrategy_8cpp.xml
+// File: ComputeFluxMagnetic_8cpp.xml
 
 
-// File: SpecularMagneticStrategy_8h.xml
+// File: ComputeFluxMagnetic_8h.xml
 
 
-// File: SpecularScalarStrategy_8cpp.xml
+// File: ComputeFluxScalar_8cpp.xml
 
 
-// File: SpecularScalarStrategy_8h.xml
+// File: ComputeFluxScalar_8h.xml
 
 
 // File: TransitionMagneticNevot_8cpp.xml