diff --git a/src/functors/initial_conditions/CMakeLists.txt b/src/functors/initial_conditions/CMakeLists.txt
index c9eb200ed40490e91da224fb9388a20415f13f16..461bde7bceb385b74b0d264953ce9fb7f289ec18 100755
--- a/src/functors/initial_conditions/CMakeLists.txt
+++ b/src/functors/initial_conditions/CMakeLists.txt
@@ -8,4 +8,4 @@ SET( headers tnlCylinderFunction.h
              tnlTwinsFunction_impl.h             
    )
    
-INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/functions/initial_conditions )
+INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/functors/initial_conditions )
diff --git a/src/functors/initial_conditions/level_set_functions/CMakeLists.txt b/src/functors/initial_conditions/level_set_functions/CMakeLists.txt
index 60fc51ec4f532e47a54de6fcde5f66fdcaaf2bfc..45ab723961fa2421b0824db1550f22b6643998d0 100755
--- a/src/functors/initial_conditions/level_set_functions/CMakeLists.txt
+++ b/src/functors/initial_conditions/level_set_functions/CMakeLists.txt
@@ -4,4 +4,4 @@ SET( headers tnlBlobFunction.h
              tnlPseudoSquareFunction_impl.h          
    )
    
-INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/functions/initial_conditions/level_set_functions )
+INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/functors/initial_conditions/level_set_functions )
diff --git a/src/problems/tnlHeatEquationProblem.h b/src/problems/tnlHeatEquationProblem.h
index f1356515c047961790afb9f8d44dc6e5749656f9..79e5c4af376f68428b0d367f28590465465a943c 100644
--- a/src/problems/tnlHeatEquationProblem.h
+++ b/src/problems/tnlHeatEquationProblem.h
@@ -77,8 +77,8 @@ class tnlHeatEquationProblem : public tnlPDEProblem< Mesh,
                            const RealType& tau,
                            const MeshType& mesh,
                            DofVectorType& _u,
-                           MeshDependentDataType& meshDependentData,
-                           DofVectorType& _fu );
+                           DofVectorType& _fu,
+			   MeshDependentDataType& meshDependentData );
 
       template< typename Matrix >
       void assemblyLinearSystem( const RealType& time,
diff --git a/src/problems/tnlHeatEquationProblem_impl.h b/src/problems/tnlHeatEquationProblem_impl.h
index 021c4cff6e03041434688274d5a7bd710cd1977f..6774f588aa3592a12ab72e9d3df5db19b6f962f3 100644
--- a/src/problems/tnlHeatEquationProblem_impl.h
+++ b/src/problems/tnlHeatEquationProblem_impl.h
@@ -181,8 +181,8 @@ getExplicitRHS( const RealType& time,
                 const RealType& tau,
                 const MeshType& mesh,
                 DofVectorType& u,
-                MeshDependentDataType& meshDependentData,
-                DofVectorType& fu )
+                DofVectorType& fu,
+		MeshDependentDataType& meshDependentData )
 {
    /****
     * If you use an explicit solver like tnlEulerSolver or tnlMersonSolver, you