diff --git a/dumux/assembly/fvlocalassemblerbase.hh b/dumux/assembly/fvlocalassemblerbase.hh
index 699b3cce3e3fd982a87dae8724ddd6e6bffefb68..24bc297d298d4b4f6302c7676f98e18398e51b00 100644
--- a/dumux/assembly/fvlocalassemblerbase.hh
+++ b/dumux/assembly/fvlocalassemblerbase.hh
@@ -136,7 +136,7 @@ public:
      */
     auto evalLocalFluxAndSourceResidual(const ElementVolumeVariables& elemVolVars) const
     {
-        return localResidual_.evalFluxSource(element_, fvGeometry_, elemVolVars, elemFluxVarsCache_, elemBcTypes_);
+        return localResidual_.evalFluxAndSource(element_, fvGeometry_, elemVolVars, elemFluxVarsCache_, elemBcTypes_);
     }
 
     /*!
diff --git a/dumux/assembly/fvlocalresidual.hh b/dumux/assembly/fvlocalresidual.hh
index 3e06c94d388f9e506e94027724775678c5d5f0d1..a26e90e227ffbccf9e57a3481c359aa802629e12 100644
--- a/dumux/assembly/fvlocalresidual.hh
+++ b/dumux/assembly/fvlocalresidual.hh
@@ -144,7 +144,7 @@ public:
      * \param bcTypes The types of the boundary conditions for all boundary entities of an element
      * \param elemFluxVarsCache The flux variable caches for the element stencil
      */
-    DUNE_DEPRECATED_MSG("eval is deprecated because it doesn't allow to specify on which time level to evaluate. Use evalFluxSource, and evalStorage instead!")
+    DUNE_DEPRECATED_MSG("eval is deprecated because it doesn't allow to specify on which time level to evaluate. Use evalFluxAndSource, and evalStorage instead!")
     ElementResidualVector eval(const Problem& problem,
                                const Element& element,
                                const FVElementGeometry& fvGeometry,
@@ -219,7 +219,7 @@ public:
      * \param bcTypes The types of the boundary conditions for all boundary entities of an element
      * \param elemFluxVarsCache The flux variable caches for the element stencil
      */
-    DUNE_DEPRECATED_MSG("Use evalFluxSource instead!")
+    DUNE_DEPRECATED_MSG("Use evalFluxAndSource instead!")
     ElementResidualVector eval(const Problem& problem,
                                const Element& element,
                                const FVElementGeometry& fvGeometry,
@@ -227,14 +227,14 @@ public:
                                const ElementBoundaryTypes &bcTypes,
                                const ElementFluxVariablesCache& elemFluxVarsCache) const
     {
-        return evalFluxSource(element, fvGeometry, curElemVolVars, elemFluxVarsCache, bcTypes);
+        return evalFluxAndSource(element, fvGeometry, curElemVolVars, elemFluxVarsCache, bcTypes);
     }
 
-    ElementResidualVector evalFluxSource(const Element& element,
-                                         const FVElementGeometry& fvGeometry,
-                                         const ElementVolumeVariables& elemVolVars,
-                                         const ElementFluxVariablesCache& elemFluxVarsCache,
-                                         const ElementBoundaryTypes &bcTypes) const
+    ElementResidualVector evalFluxAndSource(const Element& element,
+                                            const FVElementGeometry& fvGeometry,
+                                            const ElementVolumeVariables& elemVolVars,
+                                            const ElementFluxVariablesCache& elemFluxVarsCache,
+                                            const ElementBoundaryTypes &bcTypes) const
     {
         // initialize the residual vector for all scvs in this element
         ElementResidualVector residual(fvGeometry.numScv());
diff --git a/dumux/porousmediumflow/mpnc/localresidual.hh b/dumux/porousmediumflow/mpnc/localresidual.hh
index d982de82f85d55f6c8ae25fa820ff196f0967036..737b507b71e7c23231995d98e480a2b8192ab4a7 100644
--- a/dumux/porousmediumflow/mpnc/localresidual.hh
+++ b/dumux/porousmediumflow/mpnc/localresidual.hh
@@ -60,13 +60,13 @@ public:
 
     using typename ParentType::ElementResidualVector;
 
-    ElementResidualVector evalFluxSource(const Element& element,
-                                         const FVElementGeometry& fvGeometry,
-                                         const ElementVolumeVariables& elemVolVars,
-                                         const ElementFluxVariablesCache& elemFluxVarsCache,
-                                         const ElementBoundaryTypes &bcTypes) const
+    ElementResidualVector evalFluxAndSource(const Element& element,
+                                            const FVElementGeometry& fvGeometry,
+                                            const ElementVolumeVariables& elemVolVars,
+                                            const ElementFluxVariablesCache& elemFluxVarsCache,
+                                            const ElementBoundaryTypes &bcTypes) const
     {
-        ElementResidualVector residual = ParentType::evalFluxSource(element, fvGeometry, elemVolVars, elemFluxVarsCache, bcTypes);
+        ElementResidualVector residual = ParentType::evalFluxAndSource(element, fvGeometry, elemVolVars, elemFluxVarsCache, bcTypes);
 
         for (auto&& scv : scvs(fvGeometry))
         {