diff --git a/src/scheme/DiscreteFunctionP0.hpp b/src/scheme/DiscreteFunctionP0.hpp
index c2ee7f44d8d26ea619511f96ae89675def2243ac..2c90637fbf9069d4e940d8d7edf20302a55f7613 100644
--- a/src/scheme/DiscreteFunctionP0.hpp
+++ b/src/scheme/DiscreteFunctionP0.hpp
@@ -125,8 +125,8 @@ class DiscreteFunctionP0 : public IDiscreteFunction
   PUGS_INLINE friend DiscreteFunctionP0<Dimension, decltype(LHSDataType{} + DataType{})>
   operator+(const LHSDataType& a, const DiscreteFunctionP0& g)
   {
-    using ProductDataType = decltype(LHSDataType{} + DataType{});
-    DiscreteFunctionP0<Dimension, ProductDataType> sum(g.m_mesh);
+    using SumDataType = decltype(LHSDataType{} + DataType{});
+    DiscreteFunctionP0<Dimension, SumDataType> sum(g.m_mesh);
     parallel_for(
       g.m_mesh->numberOfCells(), PUGS_LAMBDA(CellId cell_id) { sum[cell_id] = a + g[cell_id]; });
     return sum;
@@ -136,8 +136,8 @@ class DiscreteFunctionP0 : public IDiscreteFunction
   PUGS_INLINE friend DiscreteFunctionP0<Dimension, decltype(DataType{} + RHSDataType{})>
   operator+(const DiscreteFunctionP0& f, const RHSDataType& b)
   {
-    using ProductDataType = decltype(DataType{} + RHSDataType{});
-    DiscreteFunctionP0<Dimension, ProductDataType> sum(f.m_mesh);
+    using SumDataType = decltype(DataType{} + RHSDataType{});
+    DiscreteFunctionP0<Dimension, SumDataType> sum(f.m_mesh);
     parallel_for(
       f.m_mesh->numberOfCells(), PUGS_LAMBDA(CellId cell_id) { sum[cell_id] = f[cell_id] + b; });
     return sum;
@@ -159,8 +159,8 @@ class DiscreteFunctionP0 : public IDiscreteFunction
   PUGS_INLINE friend DiscreteFunctionP0<Dimension, decltype(LHSDataType{} - DataType{})>
   operator-(const LHSDataType& a, const DiscreteFunctionP0& g)
   {
-    using ProductDataType = decltype(LHSDataType{} - DataType{});
-    DiscreteFunctionP0<Dimension, ProductDataType> difference(g.m_mesh);
+    using DifferenceDataType = decltype(LHSDataType{} - DataType{});
+    DiscreteFunctionP0<Dimension, DifferenceDataType> difference(g.m_mesh);
     parallel_for(
       g.m_mesh->numberOfCells(), PUGS_LAMBDA(CellId cell_id) { difference[cell_id] = a - g[cell_id]; });
     return difference;
@@ -170,8 +170,8 @@ class DiscreteFunctionP0 : public IDiscreteFunction
   PUGS_INLINE friend DiscreteFunctionP0<Dimension, decltype(DataType{} - RHSDataType{})>
   operator-(const DiscreteFunctionP0& f, const RHSDataType& b)
   {
-    using ProductDataType = decltype(DataType{} - RHSDataType{});
-    DiscreteFunctionP0<Dimension, ProductDataType> difference(f.m_mesh);
+    using DifferenceDataType = decltype(DataType{} - RHSDataType{});
+    DiscreteFunctionP0<Dimension, DifferenceDataType> difference(f.m_mesh);
     parallel_for(
       f.m_mesh->numberOfCells(), PUGS_LAMBDA(CellId cell_id) { difference[cell_id] = f[cell_id] - b; });
     return difference;
@@ -227,8 +227,8 @@ class DiscreteFunctionP0 : public IDiscreteFunction
   PUGS_INLINE friend DiscreteFunctionP0<Dimension, decltype(LHSDataType{} / DataType{})>
   operator/(const LHSDataType& a, const DiscreteFunctionP0& f)
   {
-    using ProductDataType = decltype(LHSDataType{} / DataType{});
-    DiscreteFunctionP0<Dimension, ProductDataType> ratio(f.m_mesh);
+    using RatioDataType = decltype(LHSDataType{} / DataType{});
+    DiscreteFunctionP0<Dimension, RatioDataType> ratio(f.m_mesh);
     parallel_for(
       f.m_mesh->numberOfCells(), PUGS_LAMBDA(CellId cell_id) { ratio[cell_id] = a / f[cell_id]; });
     return ratio;
@@ -238,8 +238,8 @@ class DiscreteFunctionP0 : public IDiscreteFunction
   PUGS_INLINE friend DiscreteFunctionP0<Dimension, decltype(DataType{} / RHSDataType{})>
   operator/(const DiscreteFunctionP0& f, const RHSDataType& b)
   {
-    using ProductDataType = decltype(DataType{} / RHSDataType{});
-    DiscreteFunctionP0<Dimension, ProductDataType> ratio(f.m_mesh);
+    using RatioDataType = decltype(DataType{} / RHSDataType{});
+    DiscreteFunctionP0<Dimension, RatioDataType> ratio(f.m_mesh);
     parallel_for(
       f.m_mesh->numberOfCells(), PUGS_LAMBDA(CellId cell_id) { ratio[cell_id] = f[cell_id] / b; });
     return ratio;