diff --git a/ProcessLib/SteadyStateDiffusion/Tests.cmake b/ProcessLib/SteadyStateDiffusion/Tests.cmake
index 54408f819e49fef7f3250e46a4c267d82964a21d..59913e5186f2180e303712b98fce42bad524e42d 100644
--- a/ProcessLib/SteadyStateDiffusion/Tests.cmake
+++ b/ProcessLib/SteadyStateDiffusion/Tests.cmake
@@ -1,8 +1,8 @@
 # CUBE 1x1x1 GROUNDWATER FLOW TESTS
 foreach(mesh_size 1e0 1e1 1e2 1e3)
     AddTest(
-        NAME GroundWaterFlowProcess_cube_1x1x1_${mesh_size}
-        PATH Elliptic/cube_1x1x1_GroundWaterFlow
+        NAME SteadyStateDiffusion_cube_1x1x1_${mesh_size}
+        PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
         EXECUTABLE ogs
         EXECUTABLE_ARGS cube_${mesh_size}.prj
         TESTER vtkdiff
@@ -12,8 +12,8 @@ foreach(mesh_size 1e0 1e1 1e2 1e3)
     )
 
     AddTest(
-        NAME GroundWaterFlowProcess_cube_1x1x1_${mesh_size}_Newton
-        PATH Elliptic/cube_1x1x1_GroundWaterFlow
+        NAME SteadyStateDiffusion_cube_1x1x1_${mesh_size}_Newton
+        PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
         EXECUTABLE ogs
         EXECUTABLE_ARGS cube_${mesh_size}_newton.prj
         TESTER vtkdiff
@@ -23,8 +23,8 @@ foreach(mesh_size 1e0 1e1 1e2 1e3)
     )
 
     AddTest(
-        NAME GroundWaterFlowProcess_cube_1x1x1_Neumann_${mesh_size}
-        PATH Elliptic/cube_1x1x1_GroundWaterFlow
+        NAME SteadyStateDiffusion_cube_1x1x1_Neumann_${mesh_size}
+        PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
         EXECUTABLE ogs
         EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj
         TESTER vtkdiff
@@ -39,8 +39,8 @@ foreach(mesh_size 1e4 2e4 3e4 4e4 5e4 1e5 1e6)
         set(benchmark_type LARGE_)
     endif()
     AddTest(
-        NAME ${benchmark_type}GroundWaterFlowProcess_cube_1x1x1_${mesh_size}
-        PATH Elliptic/cube_1x1x1_GroundWaterFlow
+        NAME ${benchmark_type}SteadyStateDiffusion_cube_1x1x1_${mesh_size}
+        PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
         EXECUTABLE ogs
         EXECUTABLE_ARGS cube_${mesh_size}.prj
         TESTER vtkdiff
@@ -50,8 +50,8 @@ foreach(mesh_size 1e4 2e4 3e4 4e4 5e4 1e5 1e6)
     )
 
     AddTest(
-        NAME ${benchmark_type}GroundWaterFlowProcess_cube_1x1x1_Neumann_${mesh_size}
-        PATH Elliptic/cube_1x1x1_GroundWaterFlow
+        NAME ${benchmark_type}SteadyStateDiffusion_cube_1x1x1_Neumann_${mesh_size}
+        PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
         EXECUTABLE ogs
         EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj
         TESTER vtkdiff
@@ -63,8 +63,8 @@ endforeach()
 
 # Quadratic hex element.
 AddTest(
-    NAME GroundWaterFlowProcess_cube_1x1x1_1e0_QuadraticHex
-    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    NAME SteadyStateDiffusion_cube_1x1x1_1e0_QuadraticHex
+    PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS cube_1e0_quadratic_hex.prj
     TESTER vtkdiff
@@ -76,8 +76,8 @@ AddTest(
 # SQUARE 1x1 GROUNDWATER FLOW TESTS
 foreach(mesh_size 1e0 1e1 1e2 1e3 1e4)
     AddTest(
-        NAME GroundWaterFlowProcess_square_1x1_${mesh_size}
-        PATH Elliptic/square_1x1_GroundWaterFlow
+        NAME SteadyStateDiffusion_square_1x1_${mesh_size}
+        PATH Elliptic/square_1x1_SteadyStateDiffusion
         EXECUTABLE ogs
         EXECUTABLE_ARGS square_${mesh_size}.prj
         TESTER vtkdiff
@@ -88,8 +88,8 @@ foreach(mesh_size 1e0 1e1 1e2 1e3 1e4)
     )
 
     AddTest(
-        NAME GroundWaterFlowProcess_square_1x1_Neumann_${mesh_size}
-        PATH Elliptic/square_1x1_GroundWaterFlow
+        NAME SteadyStateDiffusion_square_1x1_Neumann_${mesh_size}
+        PATH Elliptic/square_1x1_SteadyStateDiffusion
         EXECUTABLE ogs
         EXECUTABLE_ARGS square_${mesh_size}_neumann.prj
         TESTER vtkdiff
@@ -105,8 +105,8 @@ foreach(mesh_size 1e5 1e6)
         set(benchmark_type LARGE_)
     endif()
     AddTest(
-        NAME ${benchmark_type}GroundWaterFlowProcess_square_1x1_Neumann_${mesh_size}
-        PATH Elliptic/square_1x1_GroundWaterFlow
+        NAME ${benchmark_type}SteadyStateDiffusion_square_1x1_Neumann_${mesh_size}
+        PATH Elliptic/square_1x1_SteadyStateDiffusion
         EXECUTABLE ogs
         EXECUTABLE_ARGS square_${mesh_size}_neumann.prj
         TESTER vtkdiff
@@ -117,8 +117,8 @@ foreach(mesh_size 1e5 1e6)
 endforeach()
 
 AddTest(
-    NAME GroundWaterFlowProcess_square_1x1_1e5
-    PATH Elliptic/square_1x1_GroundWaterFlow
+    NAME SteadyStateDiffusion_square_1x1_1e5
+    PATH Elliptic/square_1x1_SteadyStateDiffusion
     RUNTIME 2
     EXECUTABLE ogs
     EXECUTABLE_ARGS square_1e5.prj
@@ -130,8 +130,8 @@ AddTest(
 
 # The largest test is less accurate
 AddTest(
-    NAME LARGE_GroundWaterFlowProcess_square_1x1_1e6
-    PATH Elliptic/square_1x1_GroundWaterFlow
+    NAME LARGE_SteadyStateDiffusion_square_1x1_1e6
+    PATH Elliptic/square_1x1_SteadyStateDiffusion
     RUNTIME 36
     EXECUTABLE ogs
     EXECUTABLE_ARGS square_1e6.prj
@@ -144,8 +144,8 @@ AddTest(
 # LINE 1 GROUNDWATER FLOW TESTS
 foreach(mesh_size 1e1)
     AddTest(
-        NAME GroundWaterFlowProcess_line_1_${mesh_size}
-        PATH Elliptic/line_1_GroundWaterFlow
+        NAME SteadyStateDiffusion_line_1_${mesh_size}
+        PATH Elliptic/line_1_SteadyStateDiffusion
         EXECUTABLE ogs
         EXECUTABLE_ARGS line_${mesh_size}.prj
         TESTER vtkdiff
@@ -155,8 +155,8 @@ foreach(mesh_size 1e1)
     )
 
     AddTest(
-        NAME GroundWaterFlowProcess_line_1_Neumann_${mesh_size}
-        PATH Elliptic/line_1_GroundWaterFlow
+        NAME SteadyStateDiffusion_line_1_Neumann_${mesh_size}
+        PATH Elliptic/line_1_SteadyStateDiffusion
         EXECUTABLE ogs
         EXECUTABLE_ARGS line_${mesh_size}_neumann.prj
         TESTER vtkdiff
@@ -166,8 +166,8 @@ foreach(mesh_size 1e1)
     )
 
     AddTest(
-        NAME GroundWaterFlowProcess_line_1_Robin_Right_Picard_${mesh_size}
-        PATH Elliptic/line_1_GroundWaterFlow
+        NAME SteadyStateDiffusion_line_1_Robin_Right_Picard_${mesh_size}
+        PATH Elliptic/line_1_SteadyStateDiffusion
         EXECUTABLE ogs
         EXECUTABLE_ARGS line_${mesh_size}_robin_right_picard.prj
         TESTER vtkdiff
@@ -177,8 +177,8 @@ foreach(mesh_size 1e1)
     )
 
     AddTest(
-        NAME GroundWaterFlowProcess_line_1_Robin_Left_Picard_${mesh_size}
-        PATH Elliptic/line_1_GroundWaterFlow
+        NAME SteadyStateDiffusion_line_1_Robin_Left_Picard_${mesh_size}
+        PATH Elliptic/line_1_SteadyStateDiffusion
         EXECUTABLE ogs
         EXECUTABLE_ARGS line_${mesh_size}_robin_left_picard.prj
         TESTER vtkdiff
@@ -188,8 +188,8 @@ foreach(mesh_size 1e1)
     )
 
     AddTest(
-        NAME GroundWaterFlowProcess_line_1_Time_Dep_Dirichlet_${mesh_size}
-        PATH Elliptic/line_1_GroundWaterFlow
+        NAME SteadyStateDiffusion_line_1_Time_Dep_Dirichlet_${mesh_size}
+        PATH Elliptic/line_1_SteadyStateDiffusion
         EXECUTABLE ogs
         EXECUTABLE_ARGS line_${mesh_size}_time_dep_dirichlet.prj
         TESTER vtkdiff
@@ -201,8 +201,8 @@ foreach(mesh_size 1e1)
     )
 
     AddTest(
-        NAME GroundWaterFlowProcess_line_1_Time_Dep_Neumann_${mesh_size}
-        PATH Elliptic/line_1_GroundWaterFlow
+        NAME SteadyStateDiffusion_line_1_Time_Dep_Neumann_${mesh_size}
+        PATH Elliptic/line_1_SteadyStateDiffusion
         EXECUTABLE ogs
         EXECUTABLE_ARGS line_${mesh_size}_time_dep_neumann.prj
         TESTER vtkdiff
@@ -216,8 +216,8 @@ endforeach()
 
 # Some Neumann BC tests
 AddTest(
-    NAME GroundWaterFlowProcess_cube_top
-    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    NAME SteadyStateDiffusion_cube_top
+    PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS cube_1e3_top_neumann.prj
     TESTER vtkdiff
@@ -226,8 +226,8 @@ AddTest(
     cube_1e3_top_neumann.vtu cube_1e3_top_neumann_pcs_0_ts_1_t_1.000000.vtu pressure pressure 1e-14 1e-14
 )
 AddTest(
-    NAME GroundWaterFlowProcess_cube_bottom
-    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    NAME SteadyStateDiffusion_cube_bottom
+    PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS cube_1e3_bottom_neumann.prj
     TESTER vtkdiff
@@ -237,8 +237,8 @@ AddTest(
 )
 # Some Neumann BC tests -- Newton
 AddTest(
-    NAME GroundWaterFlowProcess_cube_top_Newton
-    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    NAME SteadyStateDiffusion_cube_top_Newton
+    PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS cube_1e3_top_neumann_newton.prj
     TESTER vtkdiff
@@ -247,8 +247,8 @@ AddTest(
     cube_1e3_top_neumann.vtu cube_1e3_top_neumann_newton_pcs_0_ts_1_t_1.000000.vtu pressure pressure 1e-14 1e-14
 )
 AddTest(
-    NAME GroundWaterFlowProcess_cube_bottom_Newton
-    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    NAME SteadyStateDiffusion_cube_bottom_Newton
+    PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS cube_1e3_bottom_neumann_newton.prj
     TESTER vtkdiff
@@ -259,8 +259,8 @@ AddTest(
 
 # test SurfaceFlux
 AddTest(
-    NAME GroundWaterFlowProcess_cube_1x1x1_1e3_dirichlet_calculatesurfaceflux
-    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    NAME SteadyStateDiffusion_cube_1x1x1_1e3_dirichlet_calculatesurfaceflux
+    PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS cube_1e3_calculatesurfaceflux.prj
     TESTER vtkdiff
@@ -269,8 +269,8 @@ AddTest(
     cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu specific_flux specific_flux 5e-15 5e-15
 )
 AddTest(
-    NAME GroundWaterFlowProcess_cube_1x1x1_1e3_neumann_calculatesurfaceflux
-    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    NAME SteadyStateDiffusion_cube_1x1x1_1e3_neumann_calculatesurfaceflux
+    PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS cube_1e3_neumann_calculatesurfaceflux.prj
     TESTER vtkdiff
@@ -279,8 +279,8 @@ AddTest(
     cube_1x1x1_hex_1e3_complete_surface_neumann_specific_flux_t_1.000000.vtu cube_1x1x1_hex_1e3_complete_surface_neumann_specific_flux_t_1.000000.vtu specific_flux specific_flux 2e-14 2e-14
 )
 AddTest(
-    NAME GroundWaterFlowProcess_cube_1x1x1_2e3_prism_surfaceflux_left_right
-    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    NAME SteadyStateDiffusion_cube_1x1x1_2e3_prism_surfaceflux_left_right
+    PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS cube_2e3_prism_surfaceflux_left_right.prj
     TESTER vtkdiff
@@ -290,8 +290,8 @@ AddTest(
 )
 
 AddTest(
-    NAME GroundWaterFlowProcess_cube_1x1x1_2e3_prism_surfaceflux_front_back
-    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    NAME SteadyStateDiffusion_cube_1x1x1_2e3_prism_surfaceflux_front_back
+    PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS cube_2e3_prism_surfaceflux_front_back.prj
     TESTER vtkdiff
@@ -301,8 +301,8 @@ AddTest(
 )
 
 AddTest(
-    NAME GroundWaterFlowProcess_cube_1x1x1_2e3_prism_surfaceflux_top_bottom
-    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    NAME SteadyStateDiffusion_cube_1x1x1_2e3_prism_surfaceflux_top_bottom
+    PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS cube_2e3_prism_surfaceflux_top_bottom.prj
     TESTER vtkdiff
@@ -312,8 +312,8 @@ AddTest(
 )
 
 AddTest(
-    NAME GroundWaterFlowProcess_wedge_1x1x1_1e3_prism_surfaceflux
-    PATH Elliptic/wedge_1x1x1_GroundWaterFlow
+    NAME SteadyStateDiffusion_wedge_1x1x1_1e3_prism_surfaceflux
+    PATH Elliptic/wedge_1x1x1_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS wedge_1e3_prism_surfaceflux_diagonal.prj
     TESTER vtkdiff
@@ -325,8 +325,8 @@ AddTest(
 # SQUARE 1x1 GROUNDWATER FLOW TEST -- AXIALLY SYMMETRIC
 # test results are compared to 3D simulation on a wedge-shaped domain
 AddTest(
-    NAME GroundWaterFlowProcess_square_1x1_1e2_axi
-    PATH Elliptic/square_1x1_GroundWaterFlow
+    NAME SteadyStateDiffusion_square_1x1_1e2_axi
+    PATH Elliptic/square_1x1_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS square_1e2_axi.prj
     TESTER vtkdiff
@@ -336,8 +336,8 @@ AddTest(
 )
 # # WEDGE 1x1 GROUNDWATER FLOW TEST -- computes reference results for the above test
 # AddTest(
-#     NAME GroundWaterFlowProcess_wedge_1e2_ang_0.02
-#     PATH Elliptic/square_1x1_GroundWaterFlow
+#     NAME SteadyStateDiffusion_wedge_1e2_ang_0.02
+#     PATH Elliptic/square_1x1_SteadyStateDiffusion
 #     EXECUTABLE ogs
 #     EXECUTABLE_ARGS wedge_1e2_axi_ang_0.02.prj
 # )
@@ -345,8 +345,8 @@ AddTest(
 # SQUARE 1x1 GROUNDWATER FLOW TEST -- AXIALLY SYMMETRIC
 # test results are compared to 3D simulation on a wedge-shaped domain
 AddTest(
-    NAME GroundWaterFlowProcess_square_1x1_1e4_axi_ang_0.02
-    PATH Elliptic/square_1x1_GroundWaterFlow
+    NAME SteadyStateDiffusion_square_1x1_1e4_axi_ang_0.02
+    PATH Elliptic/square_1x1_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS square_1e4_axi.prj
     TESTER vtkdiff
@@ -356,8 +356,8 @@ AddTest(
 )
 # # WEDGE 1x1 GROUNDWATER FLOW TEST -- computes reference results for the above test
 # AddTest(
-#     NAME GroundWaterFlowProcess_wedge_1e4_ang_0.02
-#     PATH Elliptic/square_1x1_GroundWaterFlow
+#     NAME SteadyStateDiffusion_wedge_1e4_ang_0.02
+#     PATH Elliptic/square_1x1_SteadyStateDiffusion
 #     EXECUTABLE ogs
 #     EXECUTABLE_ARGS wedge_1e4_axi_ang_0.02.prj
 # )
@@ -424,8 +424,8 @@ AddTest(
 # CUBE 1x1x1 GROUNDWATER FLOW TESTS
 foreach(mesh_size 1e0 1e1 1e2 1e3)
     AddTest(
-        NAME GroundWaterFlowProcess_cube_1x1x1_${mesh_size}
-        PATH Elliptic/cube_1x1x1_GroundWaterFlow
+        NAME SteadyStateDiffusion_cube_1x1x1_${mesh_size}
+        PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
         EXECUTABLE_ARGS cube_${mesh_size}.prj
         WRAPPER mpirun
         WRAPPER_ARGS -np 1
@@ -436,8 +436,8 @@ foreach(mesh_size 1e0 1e1 1e2 1e3)
     )
 
     AddTest(
-        NAME GroundWaterFlowProcess_cube_1x1x1_Neumann_${mesh_size}
-        PATH Elliptic/cube_1x1x1_GroundWaterFlow
+        NAME SteadyStateDiffusion_cube_1x1x1_Neumann_${mesh_size}
+        PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
         EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj
         WRAPPER mpirun
         WRAPPER_ARGS -np 1
@@ -451,8 +451,8 @@ endforeach()
 # TODO: Parallel LARGE tests not tested!
 foreach(mesh_size 1e4 2e4 3e4 4e4 5e4 1e5 1e6)
     AddTest(
-        NAME LARGE_GroundWaterFlowProcess_cube_1x1x1_${mesh_size}
-        PATH Elliptic/cube_1x1x1_GroundWaterFlow
+        NAME LARGE_SteadyStateDiffusion_cube_1x1x1_${mesh_size}
+        PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
         EXECUTABLE_ARGS cube_${mesh_size}.prj
         WRAPPER mpirun
         WRAPPER_ARGS -np 1
@@ -463,8 +463,8 @@ foreach(mesh_size 1e4 2e4 3e4 4e4 5e4 1e5 1e6)
     )
 
     AddTest(
-        NAME LARGE_GroundWaterFlowProcess_cube_1x1x1_Neumann_${mesh_size}
-        PATH Elliptic/cube_1x1x1_GroundWaterFlow
+        NAME LARGE_SteadyStateDiffusion_cube_1x1x1_Neumann_${mesh_size}
+        PATH Elliptic/cube_1x1x1_SteadyStateDiffusion
         EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj
         WRAPPER mpirun
         WRAPPER_ARGS -np 1
@@ -478,8 +478,8 @@ endforeach()
 # SQUARE 1x1 GROUNDWATER FLOW TESTS
 foreach(mesh_size 1e0 1e1 1e2 1e3 1e4)
     AddTest(
-        NAME GroundWaterFlowProcess_square_1x1_${mesh_size}
-        PATH Elliptic/square_1x1_GroundWaterFlow
+        NAME SteadyStateDiffusion_square_1x1_${mesh_size}
+        PATH Elliptic/square_1x1_SteadyStateDiffusion
         EXECUTABLE_ARGS square_${mesh_size}.prj
         WRAPPER mpirun
         WRAPPER_ARGS -np 1
@@ -490,8 +490,8 @@ foreach(mesh_size 1e0 1e1 1e2 1e3 1e4)
     )
 
     AddTest(
-        NAME GroundWaterFlowProcess_square_1x1_Neumann_${mesh_size}
-        PATH Elliptic/square_1x1_GroundWaterFlow
+        NAME SteadyStateDiffusion_square_1x1_Neumann_${mesh_size}
+        PATH Elliptic/square_1x1_SteadyStateDiffusion
         EXECUTABLE_ARGS square_${mesh_size}_neumann.prj
         WRAPPER mpirun
         WRAPPER_ARGS -np 1
@@ -504,8 +504,8 @@ endforeach()
 
 foreach(mesh_size 1e5 1e6)
     AddTest(
-        NAME LARGE_GroundWaterFlowProcess_square_1x1_${mesh_size}
-        PATH Elliptic/square_1x1_GroundWaterFlow
+        NAME LARGE_SteadyStateDiffusion_square_1x1_${mesh_size}
+        PATH Elliptic/square_1x1_SteadyStateDiffusion
         EXECUTABLE_ARGS square_${mesh_size}.prj
         WRAPPER mpirun
         WRAPPER_ARGS -np 1
@@ -516,8 +516,8 @@ foreach(mesh_size 1e5 1e6)
     )
 
     AddTest(
-        NAME LARGE_GroundWaterFlowProcess_square_1x1_Neumann_${mesh_size}
-        PATH Elliptic/square_1x1_GroundWaterFlow
+        NAME LARGE_SteadyStateDiffusion_square_1x1_Neumann_${mesh_size}
+        PATH Elliptic/square_1x1_SteadyStateDiffusion
         EXECUTABLE_ARGS square_${mesh_size}_neumann.prj
         WRAPPER mpirun
         WRAPPER_ARGS -np 1
@@ -531,8 +531,8 @@ endforeach()
 # LINE 1 GROUNDWATER FLOW TESTS
 foreach(mesh_size 1e1)
     AddTest(
-        NAME GroundWaterFlowProcess_line_1_${mesh_size}
-        PATH Elliptic/line_1_GroundWaterFlow
+        NAME SteadyStateDiffusion_line_1_${mesh_size}
+        PATH Elliptic/line_1_SteadyStateDiffusion
         EXECUTABLE_ARGS line_${mesh_size}.prj
         WRAPPER mpirun
         WRAPPER_ARGS -np 1
@@ -543,8 +543,8 @@ foreach(mesh_size 1e1)
     )
 
     AddTest(
-        NAME GroundWaterFlowProcess_line_1_Neumann_${mesh_size}
-        PATH Elliptic/line_1_GroundWaterFlow
+        NAME SteadyStateDiffusion_line_1_Neumann_${mesh_size}
+        PATH Elliptic/line_1_SteadyStateDiffusion
         EXECUTABLE_ARGS line_${mesh_size}_neumann.prj
         WRAPPER mpirun
         WRAPPER_ARGS -np 1
@@ -556,8 +556,8 @@ foreach(mesh_size 1e1)
 endforeach()
 
 AddTest(
-    NAME GroundWaterFlowProcess_Inhomogeneous_permeability
-    PATH Elliptic/nonuniform_bc_Groundwaterflow
+    NAME SteadyStateDiffusion_Inhomogeneous_permeability
+    PATH Elliptic/nonuniform_bc_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS inhomogeneous_permeability.prj
     TESTER vtkdiff
@@ -567,8 +567,8 @@ AddTest(
 )
 
 AddTest(
-    NAME GroundWaterFlowProcess_Neumann_nonuniform_cosY
-    PATH Elliptic/nonuniform_bc_Groundwaterflow
+    NAME SteadyStateDiffusion_Neumann_nonuniform_cosY
+    PATH Elliptic/nonuniform_bc_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS neumann_nonuniform.prj
     TESTER vtkdiff
@@ -579,8 +579,8 @@ AddTest(
 )
 
 AddTest(
-    NAME GroundWaterFlowProcess_Dirichlet_nonuniform_linearY
-    PATH Elliptic/nonuniform_bc_Groundwaterflow
+    NAME SteadyStateDiffusion_Dirichlet_nonuniform_linearY
+    PATH Elliptic/nonuniform_bc_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS dirichlet_nonuniform.prj
     TESTER vtkdiff
@@ -594,7 +594,7 @@ AddTest(
 # analytical solution in 2 dimensions is valid:
 # u(x,y) = ln(sqrt((x-xi)^2+(y-eta)^2))/(2 * Pi)
 AddTest(
-    NAME GroundWaterFlowProcess_NodalSourceTerm_circle_1e1
+    NAME SteadyStateDiffusion_NodalSourceTerm_circle_1e1
     PATH Elliptic/circle_radius_1
     EXECUTABLE ogs
     EXECUTABLE_ARGS circle_1e1_axi.prj
@@ -607,7 +607,7 @@ AddTest(
 )
 
 AddTest(
-    NAME GroundWaterFlowProcess_NodalSourceTerm_circle_1e2
+    NAME SteadyStateDiffusion_NodalSourceTerm_circle_1e2
     PATH Elliptic/circle_radius_1
     EXECUTABLE ogs
     EXECUTABLE_ARGS circle_1e2_axi.prj
@@ -620,7 +620,7 @@ AddTest(
 )
 
 AddTest(
-    NAME GroundWaterFlowProcess_NodalSourceTerm_circle_1e3
+    NAME SteadyStateDiffusion_NodalSourceTerm_circle_1e3
     PATH Elliptic/circle_radius_1
     EXECUTABLE ogs
     EXECUTABLE_ARGS circle_1e3_axi.prj
@@ -633,7 +633,7 @@ AddTest(
 )
 
 AddTest(
-    NAME GroundWaterFlowProcess_NodalSourceTerm_circle_1e4
+    NAME SteadyStateDiffusion_NodalSourceTerm_circle_1e4
     PATH Elliptic/circle_radius_1
     EXECUTABLE ogs
     EXECUTABLE_ARGS circle_1e4_axi.prj
@@ -646,7 +646,7 @@ AddTest(
 )
 
 AddTest(
-    NAME GroundWaterFlowProcess_NodalSourceTerm_circle_1e5
+    NAME SteadyStateDiffusion_NodalSourceTerm_circle_1e5
     PATH Elliptic/circle_radius_1
     EXECUTABLE ogs
     EXECUTABLE_ARGS circle_1e5_axi.prj
@@ -659,7 +659,7 @@ AddTest(
 )
 
 AddTest(
-    NAME LARGE_GroundWaterFlowProcess_NodalSourceTerm_circle_1e6
+    NAME LARGE_SteadyStateDiffusion_NodalSourceTerm_circle_1e6
     PATH Elliptic/circle_radius_1
     EXECUTABLE ogs
     EXECUTABLE_ARGS circle_1e6_axi.prj
@@ -672,8 +672,8 @@ AddTest(
 )
 
 AddTest(
-    NAME LARGE_GroundWaterFlowProcess_NodalSourceTerm_square_1e6
-    PATH Elliptic/square_1x1_GroundWaterFlow
+    NAME LARGE_SteadyStateDiffusion_NodalSourceTerm_square_1e6
+    PATH Elliptic/square_1x1_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS square_1e6_with_nodal_sources.prj
     WRAPPER time
@@ -685,8 +685,8 @@ AddTest(
 )
 
 AddTest(
-    NAME GroundWaterFlowProcess_VolumetricSourceTerm_square_1e2
-    PATH Elliptic/square_1x1_GroundWaterFlow
+    NAME SteadyStateDiffusion_VolumetricSourceTerm_square_1e2
+    PATH Elliptic/square_1x1_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS square_1e2_volumetricsourceterm.prj
     WRAPPER time
@@ -697,8 +697,8 @@ AddTest(
 )
 
 AddTest(
-    NAME GroundWaterFlowProcess_VolumetricSourceTerm_square_1e3
-    PATH Elliptic/square_1x1_GroundWaterFlow
+    NAME SteadyStateDiffusion_VolumetricSourceTerm_square_1e3
+    PATH Elliptic/square_1x1_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS square_1e3_volumetricsourceterm.prj
     WRAPPER time
@@ -709,7 +709,7 @@ AddTest(
 )
 
 AddTest(
-    NAME GroundWaterFlowProcess_NeumannBC_Along_Line_in_3D_domain
+    NAME SteadyStateDiffusion_NeumannBC_Along_Line_in_3D_domain
     PATH Elliptic/quarter_disc
     EXECUTABLE ogs
     EXECUTABLE_ARGS quarter_disc_neumann.prj
@@ -721,7 +721,7 @@ AddTest(
 )
 
 AddTest(
-    NAME GroundWaterFlowProcess_NeumannBC_In_Center_Point_2D_domain
+    NAME SteadyStateDiffusion_NeumannBC_In_Center_Point_2D_domain
     PATH Elliptic/quarter_circle
     EXECUTABLE ogs
     EXECUTABLE_ARGS quarter_circle_neumann.prj
@@ -733,8 +733,8 @@ AddTest(
 )
 
 AddTest(
-    NAME GroundWaterFlowProcess_VolumetricSourceTerm_sin_x_sin_y_square_1e3
-    PATH Elliptic/square_1x1_GroundWaterFlow
+    NAME SteadyStateDiffusion_VolumetricSourceTerm_sin_x_sin_y_square_1e3
+    PATH Elliptic/square_1x1_SteadyStateDiffusion
     EXECUTABLE ogs
     EXECUTABLE_ARGS square_1e3_volumetricsourcetermdataarray.prj
     WRAPPER time
@@ -747,8 +747,8 @@ AddTest(
 )
 
 AddTest(
-    NAME PythonBCGroundWaterFlowProcessLaplaceEqDirichletNeumann
-    PATH Elliptic/square_1x1_GroundWaterFlow_Python
+    NAME PythonBCSteadyStateDiffusionLaplaceEqDirichletNeumann
+    PATH Elliptic/square_1x1_SteadyStateDiffusion_Python
     EXECUTABLE ogs
     EXECUTABLE_ARGS square_1e3_laplace_eq.prj
     WRAPPER time
@@ -760,7 +760,7 @@ AddTest(
 
 AddTest(
     NAME PythonSourceTermPoissonSinAXSinBYDirichlet_square_1e3
-    PATH Elliptic/square_1x1_GroundWaterFlow_Python
+    PATH Elliptic/square_1x1_SteadyStateDiffusion_Python
     EXECUTABLE ogs
     EXECUTABLE_ARGS square_1e3_poisson_sin_x_sin_y.prj
     WRAPPER time
@@ -772,7 +772,7 @@ AddTest(
 
 AddTest(
     NAME PythonSourceTermPoissonSinAXSinBYDirichlet_square_1e5
-    PATH Elliptic/square_1x1_GroundWaterFlow_Python
+    PATH Elliptic/square_1x1_SteadyStateDiffusion_Python
     EXECUTABLE ogs
     EXECUTABLE_ARGS square_1e5_poisson_sin_x_sin_y.prj
     WRAPPER time
@@ -783,5 +783,5 @@ AddTest(
 )
 
 if (NOT OGS_USE_MPI)
-    OgsTest(PROJECTFILE "Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4_anisotropic.prj")
+    OgsTest(PROJECTFILE "Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e4_anisotropic.prj")
 endif() # OGS_USE_MPI
diff --git a/Tests/Data/Elliptic/circle_radius_1/circle_1e1_axi.prj b/Tests/Data/Elliptic/circle_radius_1/circle_1e1_axi.prj
index 0d330a1d294c519847b1fd7fce6b7f052a7573a0..82df4e6b0ae5f6eff8bbffd53e5c2d831b867520 100644
--- a/Tests/Data/Elliptic/circle_radius_1/circle_1e1_axi.prj
+++ b/Tests/Data/Elliptic/circle_radius_1/circle_1e1_axi.prj
@@ -4,7 +4,7 @@
     <geometry>circle_1_axi.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/circle_radius_1/circle_1e2_axi.prj b/Tests/Data/Elliptic/circle_radius_1/circle_1e2_axi.prj
index 89b2353f4946edacb6e6e56e0f2d3cf9fe3f4000..27ad8cc9c9eeea69cb6fe51800ec7048a255ec03 100644
--- a/Tests/Data/Elliptic/circle_radius_1/circle_1e2_axi.prj
+++ b/Tests/Data/Elliptic/circle_radius_1/circle_1e2_axi.prj
@@ -4,7 +4,7 @@
     <geometry>circle_1_axi.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/circle_radius_1/circle_1e3_axi.prj b/Tests/Data/Elliptic/circle_radius_1/circle_1e3_axi.prj
index 14d9a346cfb807dafee99940ec0d1c71533bd797..9232168fae384211942ef8e0f7d8db467dcfae54 100644
--- a/Tests/Data/Elliptic/circle_radius_1/circle_1e3_axi.prj
+++ b/Tests/Data/Elliptic/circle_radius_1/circle_1e3_axi.prj
@@ -4,7 +4,7 @@
     <geometry>circle_1_axi.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/circle_radius_1/circle_1e4_axi.prj b/Tests/Data/Elliptic/circle_radius_1/circle_1e4_axi.prj
index 888046372b489dca3b7c1c601879f381f89ed425..7887b13c8f5072461bb8d30412381abfa97fe01c 100644
--- a/Tests/Data/Elliptic/circle_radius_1/circle_1e4_axi.prj
+++ b/Tests/Data/Elliptic/circle_radius_1/circle_1e4_axi.prj
@@ -4,7 +4,7 @@
     <geometry>circle_1_axi.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/circle_radius_1/circle_1e5_axi.prj b/Tests/Data/Elliptic/circle_radius_1/circle_1e5_axi.prj
index fd642939c9d4a3d4e05d9c523eaed1cc65d6d017..367391f2a14e5049ff90c371c4078779147ccad9 100644
--- a/Tests/Data/Elliptic/circle_radius_1/circle_1e5_axi.prj
+++ b/Tests/Data/Elliptic/circle_radius_1/circle_1e5_axi.prj
@@ -4,7 +4,7 @@
     <geometry>circle_1_axi.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/circle_radius_1/circle_1e6_axi.prj b/Tests/Data/Elliptic/circle_radius_1/circle_1e6_axi.prj
index 87f69d06d62f259923e8ea60bf1f0aa7ff11f2f2..2d5ab0fe74111f653dfc8dc8b43bcc0798aa6d85 100644
--- a/Tests/Data/Elliptic/circle_radius_1/circle_1e6_axi.prj
+++ b/Tests/Data/Elliptic/circle_radius_1/circle_1e6_axi.prj
@@ -4,7 +4,7 @@
     <geometry>circle_1_axi.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube.py b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube.py
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube.py
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube.py
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e0.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e0.prj
index 28f48b420083da42756f0b7e67e0d864a735ff11..17712469103f3e1e3b5fe41e4ff658d5032abf45 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e0.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -33,7 +33,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e0_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_neumann.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e0_neumann.prj
index bad6c3b5b887bd63422d52d99a71892643fab7fd..00984f89b124089da2e6588c22c63205b366c17c 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e0_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_newton.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e0_newton.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_newton.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e0_newton.prj
index c113ad7c7ddf936d7dfde4509dbacc5164896e44..0618bf38e994e1bcada6d34c010e47b5ded57789 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_newton.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e0_newton.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <jacobian_assembler>
@@ -37,7 +37,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_newton</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_quadratic_hex.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e0_quadratic_hex.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_quadratic_hex.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e0_quadratic_hex.prj
index dc346dfb3172aaabf7989c92f96f6792fd27feb6..0d2ec0e79898da46baa4683fec4aad1bbb259a0e 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0_quadratic_hex.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e0_quadratic_hex.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>3</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e1.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e1.prj
index c05935ce676c6aaa9aebdce3a27837b2839cec16..52ef8fe6eeb28b5eb1ed6585d072545808725ece 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e1.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e1_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1_neumann.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e1_neumann.prj
index 2a256032942685ac811b51935ea37ce182505dfe..1c4702478364481596291a718d69f01df7944447 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e1_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1_newton.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e1_newton.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1_newton.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e1_newton.prj
index 6120a2a41cee6ce9c22ff76f638a6093515e94b3..f9031277884a6464f919eb2cfbf43288e38487ad 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1_newton.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e1_newton.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <jacobian_assembler>
@@ -37,7 +37,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_newton</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e2.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e2.prj
index 4b0d8f3697a3eb42ee6cdc2059189940d647c597..4134e81505f28c1435c02f5469e52bc6ef390a46 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e2.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e2_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2_neumann.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e2_neumann.prj
index f4ee7ea6886fe754e43efa4220acbdc93c491e19..2824dcf47cd82b4620ee3cd8be33bd6822da8513 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e2_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2_newton.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e2_newton.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2_newton.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e2_newton.prj
index 12ec5638d3e6fcd2a536867914a10c92099658a5..a831f1f9f9e3a80b3b1e347ef4c78b6962179107 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2_newton.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e2_newton.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <jacobian_assembler>
@@ -37,7 +37,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_newton</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3.prj
index 16945f674bed2c7ebaf74cef166a2346708d0b98..5427837dd9d410b071d53421dffd98fc393c1815 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_bottom_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_bottom_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_bottom_neumann.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_bottom_neumann.prj
index 30430ea74610d8b4075ceee9ed126afa6fe7aa69..067e56955c6d0e8957e053cca53beb2a7214c5b3 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_bottom_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_bottom_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_bottom_neumann.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_bottom_neumann.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_bottom_neumann.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_bottom_neumann.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_bottom_neumann_newton.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_bottom_neumann_newton.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_bottom_neumann_newton.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_bottom_neumann_newton.prj
index eb152a3cf4b53476665c0f7ae10c115f0982b862..0c0c6e0621f5c972dca334dc21afecf6eeeeb03c 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_bottom_neumann_newton.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_bottom_neumann_newton.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <jacobian_assembler>
@@ -37,7 +37,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_newton</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_calculatesurfaceflux.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_calculatesurfaceflux.prj
similarity index 98%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_calculatesurfaceflux.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_calculatesurfaceflux.prj
index 69459b6090660044785bc37ce2d4c782c1e6d72a..a5fb2f752df57570dbef03e4acc74529e64150bf 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_calculatesurfaceflux.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_calculatesurfaceflux.prj
@@ -8,7 +8,7 @@
     </meshes>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -26,7 +26,7 @@
     </processes>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_neumann.prj
index d09aab405045d429f9a2de96934f1af4f70261fd..d29848fddf8a9702fdecfda4b5c9eb99fe910103 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann_calculatesurfaceflux.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_neumann_calculatesurfaceflux.prj
similarity index 98%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann_calculatesurfaceflux.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_neumann_calculatesurfaceflux.prj
index 8111d26cd490505bd31b01e17e6a6e275bc5fe03..cb91c3656008f194ec375c63da66f8469ec4c0d4 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann_calculatesurfaceflux.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_neumann_calculatesurfaceflux.prj
@@ -9,7 +9,7 @@
     </meshes>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -27,7 +27,7 @@
     </processes>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_newton.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_newton.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_newton.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_newton.prj
index 53c2646206e167488b6a920189b6c2c061271b7f..8d862e77399f89ebdec8f3c3a7315dc642f8bac6 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_newton.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_newton.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <jacobian_assembler>
@@ -37,7 +37,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_newton</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_top_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_top_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_top_neumann.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_top_neumann.prj
index fb239b94f082d5d070fd46cfc8afa036e9d10120..02c6624361dfd982c55c2cecb8dd428a6137e635 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_top_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_top_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_top_neumann.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_top_neumann.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_top_neumann.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_top_neumann.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_top_neumann_newton.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_top_neumann_newton.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_top_neumann_newton.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_top_neumann_newton.prj
index b01a7a1e270eee3c8e9c441dbeaa36d53fbaefc7..b6ae928690212e94a0448f8361f1c4ece0263991 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_top_neumann_newton.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e3_top_neumann_newton.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <jacobian_assembler>
@@ -37,7 +37,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_newton</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e4.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e4.prj
index 706b5dfe34fe7361595f2fb4488924200c5baf4d..1d801e395ce6ab1e1bd80c06667493ae549a71cc 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e4.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4_anisotropic.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e4_anisotropic.prj
similarity index 98%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4_anisotropic.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e4_anisotropic.prj
index b79be7b7c7bd7fedab8d520ddb08f9a46d01f406..a978cd0f2aab125398d4fe3cc79b90eb7fb3d936 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4_anisotropic.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e4_anisotropic.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -33,7 +33,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4_anisotropic_pcs_0_ts_1_t_1.000000.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e4_anisotropic_pcs_0_ts_1_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4_anisotropic_pcs_0_ts_1_t_1.000000.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e4_anisotropic_pcs_0_ts_1_t_1.000000.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e4_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4_neumann.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e4_neumann.prj
index 14125269f266572268f45c37f46a13d950e6d650..b46f7c3443c8f6221f9e0a9f2e94e6bb38e82c1a 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e4_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e4_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e5.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e5.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e5.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e5.prj
index 6dff987f31d21f8643855cb8df9a3fb3a5b8eb7f..077a05a49cf4d52798f9a6dd739ac0ee20d1ac3d 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e5.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e5.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e5_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e5_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e5_neumann.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e5_neumann.prj
index f5c33256d6cbed9b06ffab37d688d3ec8c9fa6fe..e9461d628d0d71d1d53363167d84d4f8175c02e7 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e5_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e5_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e6.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e6.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e6.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e6.prj
index 198989b558a4ab40c33db51a9b437fd772e430e7..66000e90f3fc2433bc67074c595d8e794515a8a9 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e6.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e6.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e6_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e6_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e6_neumann.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e6_neumann.prj
index 252c08aa9e9b1a3c278cc9887d412cb472c669d1..46aae419bf4406a0deb7a57c592dc31b8c802c84 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e6_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1e6_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1.gml b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1.gml
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1.gml
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1.gml
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex20_1e0.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex20_1e0.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex20_1e0.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex20_1e0.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e0.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e0.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e0.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e0.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e1.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e1.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e1.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e1.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e2.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e2.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e2.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e2.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e3.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e3.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_complete_surface.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e3_complete_surface.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_complete_surface.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e3_complete_surface.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_complete_surface_neumann_specific_flux_t_1.000000.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e3_complete_surface_neumann_specific_flux_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_complete_surface_neumann_specific_flux_t_1.000000.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e3_complete_surface_neumann_specific_flux_t_1.000000.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_front.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e3_front.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_front.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e3_front.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_left.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e3_left.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_left.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e3_left.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_right.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e3_right.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_right.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e3_right.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e4.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e4.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e4.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e4.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e4_material_groups.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e4_material_groups.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e4_material_groups.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e4_material_groups.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e5.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e5.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e5.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e5.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e6.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e6.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e6.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_1e6.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_2e4.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_2e4.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_2e4.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_2e4.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_3e4.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_3e4.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_3e4.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_3e4.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_4e4.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_4e4.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_4e4.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_4e4.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_5e4.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_5e4.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_5e4.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_hex_5e4.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_back.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_back.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_back.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_back.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_bottom.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_bottom.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_bottom.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_bottom.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_complete_surface.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_complete_surface.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface_front_back_dirichlet_specific_flux_t_1.000000.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_complete_surface_front_back_dirichlet_specific_flux_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface_front_back_dirichlet_specific_flux_t_1.000000.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_complete_surface_front_back_dirichlet_specific_flux_t_1.000000.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface_top_bottom_dirichlet_specific_flux_t_1.000000.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_complete_surface_top_bottom_dirichlet_specific_flux_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface_top_bottom_dirichlet_specific_flux_t_1.000000.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_complete_surface_top_bottom_dirichlet_specific_flux_t_1.000000.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_front.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_front.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_front.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_front.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_left.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_left.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_left.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_left.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_right.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_right.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_right.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_right.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_top.vtu b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_top.vtu
similarity index 100%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_top.vtu
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_1x1x1_prism_2e3_top.vtu
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_front_back.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_2e3_prism_surfaceflux_front_back.prj
similarity index 98%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_front_back.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_2e3_prism_surfaceflux_front_back.prj
index c52172fbd8f95e03e7b23e91feb607bbedaec895..25022a20ae63cf37587f3eaa9687e880d5b5e5fa 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_front_back.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_2e3_prism_surfaceflux_front_back.prj
@@ -8,7 +8,7 @@
     </meshes>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -26,7 +26,7 @@
     </processes>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_left_right.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_2e3_prism_surfaceflux_left_right.prj
similarity index 98%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_left_right.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_2e3_prism_surfaceflux_left_right.prj
index 1ddc9900e7bf3407af9e97e6727d59c72b53960f..17a6a07e16152d2bd6fba87ff64526f5412b4007 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_left_right.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_2e3_prism_surfaceflux_left_right.prj
@@ -8,7 +8,7 @@
     </meshes>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -26,7 +26,7 @@
     </processes>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_top_bottom.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_2e3_prism_surfaceflux_top_bottom.prj
similarity index 98%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_top_bottom.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_2e3_prism_surfaceflux_top_bottom.prj
index 6b744b085f6dc7ae4050dd38a443c5bb67f35963..d8b74a46995410c9ef830242cbe76825359f3949 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_top_bottom.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_2e3_prism_surfaceflux_top_bottom.prj
@@ -8,7 +8,7 @@
     </meshes>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -26,7 +26,7 @@
     </processes>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e4.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_2e4.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e4.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_2e4.prj
index 2eecb5ce14232b6e2082ee75b090c95f9bb71d9e..0272f11a39a62c1b2e833e8288aa3681108e8d92 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e4.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_2e4.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e4_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_2e4_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e4_neumann.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_2e4_neumann.prj
index f81e881d2fd94879c6f614bcbf74970520c16ef0..714e8aafb9ddae06cbe48c68e78cb255d471c00f 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e4_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_2e4_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_3e4.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_3e4.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_3e4.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_3e4.prj
index 4d9c65f50433f682dc6f266ed14b4e30023cc58f..edc7d7d8e690114830b0917943fcf8f4e5de44a6 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_3e4.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_3e4.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_3e4_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_3e4_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_3e4_neumann.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_3e4_neumann.prj
index a7694be05c546dbe56122a36655b4f70a604bb31..f80ce8f9d7f47c09b36e2c24d376517294cad82f 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_3e4_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_3e4_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_4e4.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_4e4.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_4e4.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_4e4.prj
index 8b10e51e2ff108682245f8308b4ff1e11adadbff..2af92c6b7af50c8f6029897b692fc737d62685eb 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_4e4.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_4e4.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_4e4_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_4e4_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_4e4_neumann.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_4e4_neumann.prj
index 7782c347ef0028d38c229b9505791e5a9c596c8b..17281d674dc97a5c1a24ab739d34d05ccdf146af 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_4e4_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_4e4_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_5e4.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_5e4.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_5e4.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_5e4.prj
index bf6d332604f4c77583920d77fbea227590fb138e..876f55f8d018cd28f6d10a91fcbd280ce903b0ec 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_5e4.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_5e4.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_5e4_neumann.prj b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_5e4_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_5e4_neumann.prj
rename to Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_5e4_neumann.prj
index d4243d8d4fd73129990565055f6a09face5238ed..d43f1707951507bd0869aeafdc2acc84dccc49cf 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_5e4_neumann.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_SteadyStateDiffusion/cube_5e4_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>cube_1x1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1.gml b/Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1.gml
similarity index 100%
rename from Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1.gml
rename to Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1.gml
diff --git a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1_line_1e1.vtu b/Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1_line_1e1.vtu
similarity index 100%
rename from Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1_line_1e1.vtu
rename to Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1_line_1e1.vtu
diff --git a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1_time_dep_dirichlet.vtu b/Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1_time_dep_dirichlet.vtu
similarity index 100%
rename from Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1_time_dep_dirichlet.vtu
rename to Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1_time_dep_dirichlet.vtu
diff --git a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1.prj b/Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1e1.prj
similarity index 97%
rename from Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1.prj
rename to Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1e1.prj
index a2230f84d9f094e957a9573750eac1b6c89b84d3..6129ad70fa02bfc2e1d10ea789a26972e2a097e5 100644
--- a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1.prj
+++ b/Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1e1.prj
@@ -4,7 +4,7 @@
     <geometry>line_1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_neumann.prj b/Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1e1_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_neumann.prj
rename to Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1e1_neumann.prj
index b8cb43c1adc51d6aec613e2cf4c6d846a2ba8e18..e813f0f64ae6a1edefa41ce31eb9d49384b1114c 100644
--- a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_neumann.prj
+++ b/Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1e1_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>line_1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_robin_left_picard.prj b/Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1e1_robin_left_picard.prj
similarity index 97%
rename from Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_robin_left_picard.prj
rename to Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1e1_robin_left_picard.prj
index d2a45eb219cd7a823cc3bff26cb2b56c04d70719..b528a27c2d095555085349884a2fb1720bb0d2aa 100644
--- a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_robin_left_picard.prj
+++ b/Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1e1_robin_left_picard.prj
@@ -4,7 +4,7 @@
     <geometry>line_1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_robin_right_picard.prj b/Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1e1_robin_right_picard.prj
similarity index 97%
rename from Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_robin_right_picard.prj
rename to Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1e1_robin_right_picard.prj
index a73402552595d86daa2b81d106afe16917da942f..38ceff3c46b46dc4ee59af7b0ccf2b729806bd6a 100644
--- a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_robin_right_picard.prj
+++ b/Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1e1_robin_right_picard.prj
@@ -4,7 +4,7 @@
     <geometry>line_1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_time_dep_dirichlet.prj b/Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1e1_time_dep_dirichlet.prj
similarity index 98%
rename from Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_time_dep_dirichlet.prj
rename to Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1e1_time_dep_dirichlet.prj
index b9754b91bffecc658b5556b421c99ff9aa397877..3357e74eb6707fe814a8b5bdb471fd7132f4ec4e 100644
--- a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_time_dep_dirichlet.prj
+++ b/Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1e1_time_dep_dirichlet.prj
@@ -4,7 +4,7 @@
     <geometry>line_1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_time_dep_neumann.prj b/Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1e1_time_dep_neumann.prj
similarity index 98%
rename from Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_time_dep_neumann.prj
rename to Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1e1_time_dep_neumann.prj
index cd10bcee408847ad601d63af4276ff8de2578f29..a39980446e45cf5de04ad064bea569d75ae82d23 100644
--- a/Tests/Data/Elliptic/line_1_GroundWaterFlow/line_1e1_time_dep_neumann.prj
+++ b/Tests/Data/Elliptic/line_1_SteadyStateDiffusion/line_1e1_time_dep_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>line_1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/dirichlet_nonuniform.prj b/Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/dirichlet_nonuniform.prj
similarity index 97%
rename from Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/dirichlet_nonuniform.prj
rename to Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/dirichlet_nonuniform.prj
index 8f7631eb78363bff52e24bb89c92d618b57a5b9c..2754189748b69e3dbfc27564c8a9a5e78be87fe1 100644
--- a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/dirichlet_nonuniform.prj
+++ b/Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/dirichlet_nonuniform.prj
@@ -7,7 +7,7 @@
     </meshes>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -19,7 +19,7 @@
     </processes>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/expected_dirichlet_nonuniform_pcs_0_ts_1_t_1.000000.vtu b/Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/expected_dirichlet_nonuniform_pcs_0_ts_1_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/expected_dirichlet_nonuniform_pcs_0_ts_1_t_1.000000.vtu
rename to Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/expected_dirichlet_nonuniform_pcs_0_ts_1_t_1.000000.vtu
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/expected_neumann_nonuniform_pcs_0_ts_1_t_1.000000.vtu b/Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/expected_neumann_nonuniform_pcs_0_ts_1_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/expected_neumann_nonuniform_pcs_0_ts_1_t_1.000000.vtu
rename to Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/expected_neumann_nonuniform_pcs_0_ts_1_t_1.000000.vtu
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_mass_flux.vtu b/Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/inhomogeneous_mass_flux.vtu
similarity index 100%
rename from Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_mass_flux.vtu
rename to Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/inhomogeneous_mass_flux.vtu
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability.gml b/Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/inhomogeneous_permeability.gml
similarity index 100%
rename from Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability.gml
rename to Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/inhomogeneous_permeability.gml
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability.prj b/Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/inhomogeneous_permeability.prj
similarity index 98%
rename from Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability.prj
rename to Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/inhomogeneous_permeability.prj
index cb241e8454528b4eb401f9e7e6adac3fa787189d..553db335b9f3d2274ef4990160e27d94101126c9 100644
--- a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability.prj
+++ b/Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/inhomogeneous_permeability.prj
@@ -7,7 +7,7 @@
     </meshes>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -20,7 +20,7 @@
     </processes>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability.vtu b/Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/inhomogeneous_permeability.vtu
similarity index 100%
rename from Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability.vtu
rename to Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/inhomogeneous_permeability.vtu
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability_bottom.vtu b/Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/inhomogeneous_permeability_bottom.vtu
similarity index 100%
rename from Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability_bottom.vtu
rename to Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/inhomogeneous_permeability_bottom.vtu
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability_top.vtu b/Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/inhomogeneous_permeability_top.vtu
similarity index 100%
rename from Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability_top.vtu
rename to Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/inhomogeneous_permeability_top.vtu
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/neumann_nonuniform.prj b/Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/neumann_nonuniform.prj
similarity index 97%
rename from Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/neumann_nonuniform.prj
rename to Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/neumann_nonuniform.prj
index 6a2fb4552bbf6319b43e0664798a89adcde871a3..10693ec05613f50d7abc7cbc08b95fd29d077d98 100644
--- a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/neumann_nonuniform.prj
+++ b/Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/neumann_nonuniform.prj
@@ -7,7 +7,7 @@
     </meshes>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -37,7 +37,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/square_1x1_left.vtu b/Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/square_1x1_left.vtu
similarity index 100%
rename from Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/square_1x1_left.vtu
rename to Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/square_1x1_left.vtu
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/square_1x1_quad_1e3.vtu b/Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/square_1x1_quad_1e3.vtu
similarity index 100%
rename from Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/square_1x1_quad_1e3.vtu
rename to Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/square_1x1_quad_1e3.vtu
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/square_1x1_right.vtu b/Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/square_1x1_right.vtu
similarity index 100%
rename from Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/square_1x1_right.vtu
rename to Tests/Data/Elliptic/nonuniform_bc_SteadyStateDiffusion/square_1x1_right.vtu
diff --git a/Tests/Data/Elliptic/quarter_circle/quarter_circle_neumann.prj b/Tests/Data/Elliptic/quarter_circle/quarter_circle_neumann.prj
index 203d6f9b52339ecdfe0e267a001bb21ce1ecb09f..d6528d6cccf8ac3f488f8432654573e57444d2fa 100644
--- a/Tests/Data/Elliptic/quarter_circle/quarter_circle_neumann.prj
+++ b/Tests/Data/Elliptic/quarter_circle/quarter_circle_neumann.prj
@@ -7,7 +7,7 @@
     </meshes>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -20,7 +20,7 @@
     </processes>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/quarter_circle/quarter_circle_nodal_source_term.prj b/Tests/Data/Elliptic/quarter_circle/quarter_circle_nodal_source_term.prj
index a673c6d331559416829460bde8cae1a7983a8d6e..5f5f871faf7974f4d135fca73456c153a6c919bf 100644
--- a/Tests/Data/Elliptic/quarter_circle/quarter_circle_nodal_source_term.prj
+++ b/Tests/Data/Elliptic/quarter_circle/quarter_circle_nodal_source_term.prj
@@ -7,7 +7,7 @@
     </meshes>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -20,7 +20,7 @@
     </processes>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/quarter_disc/quarter_disc_neumann.prj b/Tests/Data/Elliptic/quarter_disc/quarter_disc_neumann.prj
index 8931db976878b72a4097b409754fa5e583733112..c2c252082a4c13fc7e49fc913e809b2db4ebf69b 100644
--- a/Tests/Data/Elliptic/quarter_disc/quarter_disc_neumann.prj
+++ b/Tests/Data/Elliptic/quarter_disc/quarter_disc_neumann.prj
@@ -7,7 +7,7 @@
     </meshes>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -20,7 +20,7 @@
     </processes>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e0.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e0.prj
similarity index 97%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e0.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e0.prj
index 8553e9975d00862986ea470632e9a1bf1c91cda7..dc6044f0f89dfa74a7e479d477639deb4f855e8b 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e0.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e0.prj
@@ -4,7 +4,7 @@
     <geometry>square_1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e0_neumann.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e0_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e0_neumann.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e0_neumann.prj
index 4e5753a1d4cb90850876e143460d357419d18e00..18c67aed6c369e60cb8969d9ebbcbd0179addf3a 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e0_neumann.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e0_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>square_1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e1.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e1.prj
similarity index 97%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e1.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e1.prj
index d16d9ea339c5736835b1c0d1374fcb8b02b30926..2c275e85bc80d19ffacf14a9a0c69b5e75e65cc8 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e1.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e1.prj
@@ -4,7 +4,7 @@
     <geometry>square_1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e1_neumann.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e1_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e1_neumann.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e1_neumann.prj
index f1fcbb8b78f47e8f46444c4d4631a8502a7bbfa0..ccc591114d70a698e664c8dbfffbbeebe2a41f31 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e1_neumann.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e1_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>square_1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e2.prj
similarity index 97%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e2.prj
index 536bad76bc32d28519bd1eda942c97abd3be284d..ff4b1010dab839ff3f6ef9b6d96d982f0c0b929d 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e2.prj
@@ -4,7 +4,7 @@
     <geometry>square_1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_axi.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e2_axi.prj
similarity index 98%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_axi.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e2_axi.prj
index 0514f8a2c6496b0c72bc209d3ab97e97f1cf1c1d..bca1a58ba3c6d386aeb48bdbf69154c74386f2d3 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_axi.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e2_axi.prj
@@ -4,7 +4,7 @@
     <geometry>square_1x1_axi.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_neumann.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e2_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_neumann.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e2_neumann.prj
index 040831a4737e274c636ef77cacc3f5ea2ff9e2b0..7c616bfde7bfbbd7751f01f39dd1bb7486ab82b5 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_neumann.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e2_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>square_1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_volumetricsourceterm.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e2_volumetricsourceterm.prj
similarity index 98%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_volumetricsourceterm.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e2_volumetricsourceterm.prj
index 021047cfad350be975553c4c7daa569a8565b0b8..08a09f06704758918615a7d97c80d9ca805903c0 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2_volumetricsourceterm.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e2_volumetricsourceterm.prj
@@ -8,7 +8,7 @@
     </meshes>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -21,7 +21,7 @@
     </processes>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e3.prj
similarity index 97%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e3.prj
index e76950cc1c34ed1b4c0ffd36a38154496df1417f..b04701a74eebca2802ecd853e4eeee8d8d87e947 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e3.prj
@@ -26,7 +26,7 @@
     </search_length_algorithm>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -39,7 +39,7 @@
     </processes>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_neumann.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e3_neumann.prj
similarity index 98%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_neumann.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e3_neumann.prj
index 192365ae1a2a4b7c022ae6c466dcadc23229387d..c66d8b9b564c811ec174c5a241afcd1ea729e2fc 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_neumann.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e3_neumann.prj
@@ -25,7 +25,7 @@
     </search_length_algorithm>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -38,7 +38,7 @@
     </processes>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_volumetricsourceterm.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e3_volumetricsourceterm.prj
similarity index 98%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_volumetricsourceterm.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e3_volumetricsourceterm.prj
index f4ed11b9c6aa6c3c85535bfcf88a175f2050e975..eb9cd26fb5963db40d2e73b6d3c051ec4d3204bb 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_volumetricsourceterm.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e3_volumetricsourceterm.prj
@@ -8,7 +8,7 @@
     </meshes>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -21,7 +21,7 @@
     </processes>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_volumetricsourcetermdataarray.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e3_volumetricsourcetermdataarray.prj
similarity index 98%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_volumetricsourcetermdataarray.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e3_volumetricsourcetermdataarray.prj
index 8610dbe82c228fa68cc3c63a6ca08138eb92dcca..cdeacdaa52d6cbd8556007fa77394fe506d10acc 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3_volumetricsourcetermdataarray.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e3_volumetricsourcetermdataarray.prj
@@ -10,7 +10,7 @@
     </meshes>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -23,7 +23,7 @@
     </processes>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e4.prj
similarity index 97%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e4.prj
index 0fe9cd84045a86e90bbd297b1b52951d16b99f01..92f1a59b403053f107e996ed94bb105d6cea10db 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e4.prj
@@ -4,7 +4,7 @@
     <geometry>square_1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4_axi.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e4_axi.prj
similarity index 98%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4_axi.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e4_axi.prj
index 7e091ee74ad0fef19dafe9678eaa23854e6cd931..729d5429e70a54315964961ba79b329fb03e863b 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4_axi.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e4_axi.prj
@@ -4,7 +4,7 @@
     <geometry>square_1x1_axi.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4_neumann.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e4_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4_neumann.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e4_neumann.prj
index 6920b937de30a6702c72c9e18271e5509aad5b04..743ab3608738744d670541c43fd7f55fdff874e7 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e4_neumann.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e4_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>square_1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e5.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e5.prj
similarity index 97%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e5.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e5.prj
index a73a0c7ed8a997d7c35f62ba4b88714d9793a687..f61c397c0d69cd1f57ff630ea60f4a886169cacf 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e5.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e5.prj
@@ -4,7 +4,7 @@
     <geometry>square_1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e5_neumann.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e5_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e5_neumann.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e5_neumann.prj
index 8daae655fb57aed9d4f0f80c130835957c512efa..10e8126094582e7b6e5916cea33ebb908453a7d3 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e5_neumann.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e5_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>square_1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e6.prj
similarity index 97%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e6.prj
index acb1bdb595830d1a593a4ac34b46ae5f0db5d8d5..718e24f8d2ae15db8a60710347dfde0d832fc8d7 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e6.prj
@@ -4,7 +4,7 @@
     <geometry>square_1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_neumann.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e6_neumann.prj
similarity index 97%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_neumann.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e6_neumann.prj
index f162400668a9668dd77bc5f87393e096fe64fbe8..2879c519edccfd82eb908bd8e66d1b392857a30c 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_neumann.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e6_neumann.prj
@@ -4,7 +4,7 @@
     <geometry>square_1x1.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_with_nodal_sources.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e6_with_nodal_sources.prj
similarity index 98%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_with_nodal_sources.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e6_with_nodal_sources.prj
index 924b4633a9fd3897c8fe180182258c082d1d4d17..d495a9cf7cd542628a53b041e7b777e31003146f 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_with_nodal_sources.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1e6_with_nodal_sources.prj
@@ -8,7 +8,7 @@
     </meshes>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -21,7 +21,7 @@
     </processes>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1.gml b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1.gml
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1.gml
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1.gml
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_axi.gml b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_axi.gml
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_axi.gml
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_axi.gml
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_geometry_left.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_geometry_left.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_geometry_left.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_geometry_left.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_geometry_middle_point.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_geometry_middle_point.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_geometry_middle_point.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_geometry_middle_point.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_geometry_right.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_geometry_right.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_geometry_right.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_geometry_right.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_midpoint.gml b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_midpoint.gml
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_midpoint.gml
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_midpoint.gml
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e0.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e0.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e0.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e0.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e1.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e1.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e1.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e1.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e2.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e2.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e2.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e2.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e2_geometry_left.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e2_geometry_left.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e2_geometry_left.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e2_geometry_left.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e2_geometry_right.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e2_geometry_right.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e2_geometry_right.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e2_geometry_right.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e2_volumetric_source_term.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e2_volumetric_source_term.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e2_volumetric_source_term.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e2_volumetric_source_term.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e2_volumetricsourceterm_analytical_solution.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e2_volumetricsourceterm_analytical_solution.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e2_volumetricsourceterm_analytical_solution.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e2_volumetricsourceterm_analytical_solution.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_geometry_left.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_geometry_left.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_geometry_left.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_geometry_left.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_geometry_right.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_geometry_right.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_geometry_right.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_geometry_right.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_volumetric_source_term.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_volumetric_source_term.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_volumetric_source_term.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_volumetric_source_term.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_volumetricsourceterm_analytical_solution.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_volumetricsourceterm_analytical_solution.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_volumetricsourceterm_analytical_solution.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_volumetricsourceterm_analytical_solution.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_volumetricsourcetermdataarray.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_volumetricsourcetermdataarray.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_volumetricsourcetermdataarray.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_volumetricsourcetermdataarray.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_volumetricsourcetermdataarray_geometry_ll.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_volumetricsourcetermdataarray_geometry_ll.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_volumetricsourcetermdataarray_geometry_ll.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_volumetricsourcetermdataarray_geometry_ll.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_volumetricsourcetermdataarray_geometry_lr.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_volumetricsourcetermdataarray_geometry_lr.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_volumetricsourcetermdataarray_geometry_lr.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_volumetricsourcetermdataarray_geometry_lr.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_volumetricsourcetermdataarray_geometry_ul.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_volumetricsourcetermdataarray_geometry_ul.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_volumetricsourcetermdataarray_geometry_ul.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_volumetricsourcetermdataarray_geometry_ul.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_volumetricsourcetermdataarray_geometry_ur.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_volumetricsourcetermdataarray_geometry_ur.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_volumetricsourcetermdataarray_geometry_ur.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_volumetricsourcetermdataarray_geometry_ur.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_volumetricsourcetermdataarray_volumetric_source_term.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_volumetricsourcetermdataarray_volumetric_source_term.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e3_volumetricsourcetermdataarray_volumetric_source_term.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e3_volumetricsourcetermdataarray_volumetric_source_term.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e4.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e4.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e4.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e4.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e5.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e5.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e5.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e5.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e6.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e6.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e6.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e6.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e6_nodal_sources_expected.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e6_nodal_sources_expected.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_1e6_nodal_sources_expected.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_1e6_nodal_sources_expected.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_geometry_right.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_geometry_right.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_quad_geometry_right.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/square_1x1_quad_geometry_right.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge-1e2-ang-0.02-surface.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge-1e2-ang-0.02-surface.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge-1e2-ang-0.02-surface.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge-1e2-ang-0.02-surface.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge-1e2-ang-0.02.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge-1e2-ang-0.02.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge-1e2-ang-0.02.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge-1e2-ang-0.02.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge-1e2-ang-0.2-surface.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge-1e2-ang-0.2-surface.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge-1e2-ang-0.2-surface.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge-1e2-ang-0.2-surface.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge-1e2-ang-0.2.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge-1e2-ang-0.2.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge-1e2-ang-0.2.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge-1e2-ang-0.2.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge-1e4-ang-0.02-surface.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge-1e4-ang-0.02-surface.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge-1e4-ang-0.02-surface.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge-1e4-ang-0.02-surface.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge-1e4-ang-0.02.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge-1e4-ang-0.02.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge-1e4-ang-0.02.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge-1e4-ang-0.02.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge-1e4-ang-0.2.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge-1e4-ang-0.2.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge-1e4-ang-0.2.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge-1e4-ang-0.2.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge-ang-0.02.gml b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge-ang-0.02.gml
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge-ang-0.02.gml
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge-ang-0.02.gml
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge-ang-0.2.gml b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge-ang-0.2.gml
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge-ang-0.2.gml
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge-ang-0.2.gml
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e2_axi_ang_0.02.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge_1e2_axi_ang_0.02.prj
similarity index 98%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e2_axi_ang_0.02.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge_1e2_axi_ang_0.02.prj
index 06695934c6ff971562945fad9d1e39a540b1a8a1..fa74bd2177fd8652527c06b3b717aed156ee4f1b 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e2_axi_ang_0.02.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge_1e2_axi_ang_0.02.prj
@@ -4,7 +4,7 @@
     <geometry>wedge-ang-0.02.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e2_axi_ang_0.2.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge_1e2_axi_ang_0.2.prj
similarity index 98%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e2_axi_ang_0.2.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge_1e2_axi_ang_0.2.prj
index 760e63d52c4b1f0600e26709f6e27a366f5fa833..486864d6b2a886acf1cec0c9a085f1117ecb99ec 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e2_axi_ang_0.2.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge_1e2_axi_ang_0.2.prj
@@ -4,7 +4,7 @@
     <geometry>wedge-ang-0.2.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e4_axi_ang_0.02.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge_1e4_axi_ang_0.02.prj
similarity index 98%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e4_axi_ang_0.02.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge_1e4_axi_ang_0.02.prj
index 6bb6fc6d44ecd86e8d3b5b1d04fa63f6ccce4baf..6428649930b2d298defe73b4cf4adc0d94cec66d 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/wedge_1e4_axi_ang_0.02.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion/wedge_1e4_axi_ang_0.02.prj
@@ -4,7 +4,7 @@
     <geometry>wedge-ang-0.02.gml</geometry>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -34,7 +34,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/bcs_laplace_eq.py b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/bcs_laplace_eq.py
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/bcs_laplace_eq.py
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/bcs_laplace_eq.py
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/python_laplace_eq_ref.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/python_laplace_eq_ref.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/python_laplace_eq_ref.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/python_laplace_eq_ref.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/sin_x_sin_y_source_term.py b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/sin_x_sin_y_source_term.py
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/sin_x_sin_y_source_term.py
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/sin_x_sin_y_source_term.py
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e3_laplace_eq.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1e3_laplace_eq.prj
similarity index 98%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e3_laplace_eq.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1e3_laplace_eq.prj
index a72e369ca694c0bf118e8b753ae1773207b9acdf..b126b1d7718f5add337491be340bd14a134d92fc 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e3_laplace_eq.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1e3_laplace_eq.prj
@@ -22,7 +22,7 @@
     </media>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -38,7 +38,7 @@
     </processes>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_newton</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e3_poisson_sin_x_sin_y.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1e3_poisson_sin_x_sin_y.prj
similarity index 98%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e3_poisson_sin_x_sin_y.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1e3_poisson_sin_x_sin_y.prj
index 66a6a5c14d6171b7e02e59519d930a8824186317..34bd9857098d33183c901c96cf00ae734ed0cc8d 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e3_poisson_sin_x_sin_y.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1e3_poisson_sin_x_sin_y.prj
@@ -11,7 +11,7 @@
     <python_script>sin_x_sin_y_source_term.py</python_script>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -41,7 +41,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e5_poisson_sin_x_sin_y.prj b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1e5_poisson_sin_x_sin_y.prj
similarity index 98%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e5_poisson_sin_x_sin_y.prj
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1e5_poisson_sin_x_sin_y.prj
index c01c6afe97f4b4030b156e3ca408e67281a2dc89..3a05ced450fd1a653456980868e1b49d2de8d0d5 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1e5_poisson_sin_x_sin_y.prj
+++ b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1e5_poisson_sin_x_sin_y.prj
@@ -11,7 +11,7 @@
     <python_script>sin_x_sin_y_source_term.py</python_script>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -41,7 +41,7 @@
     </media>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1.gml b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1.gml
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1.gml
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1.gml
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e3.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e3.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e3.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e3.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e3_entire_domain.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e3_entire_domain.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e3_entire_domain.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e3_entire_domain.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e3_geometry_ll.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e3_geometry_ll.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e3_geometry_ll.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e3_geometry_ll.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e3_geometry_lr.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e3_geometry_lr.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e3_geometry_lr.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e3_geometry_lr.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e3_geometry_ul.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e3_geometry_ul.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e3_geometry_ul.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e3_geometry_ul.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e3_geometry_ur.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e3_geometry_ur.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e3_geometry_ur.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e3_geometry_ur.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e5.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e5.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e5.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e5.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e5_entire_domain.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e5_entire_domain.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e5_entire_domain.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e5_entire_domain.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e5_geometry_ll.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e5_geometry_ll.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e5_geometry_ll.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e5_geometry_ll.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e5_geometry_lr.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e5_geometry_lr.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e5_geometry_lr.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e5_geometry_lr.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e5_geometry_ul.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e5_geometry_ul.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e5_geometry_ul.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e5_geometry_ul.vtu
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e5_geometry_ur.vtu b/Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e5_geometry_ur.vtu
similarity index 100%
rename from Tests/Data/Elliptic/square_1x1_GroundWaterFlow_Python/square_1x1_quad_1e5_geometry_ur.vtu
rename to Tests/Data/Elliptic/square_1x1_SteadyStateDiffusion_Python/square_1x1_quad_1e5_geometry_ur.vtu
diff --git a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1e3_prism_surfaceflux_diagonal.prj b/Tests/Data/Elliptic/wedge_1x1x1_SteadyStateDiffusion/wedge_1e3_prism_surfaceflux_diagonal.prj
similarity index 98%
rename from Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1e3_prism_surfaceflux_diagonal.prj
rename to Tests/Data/Elliptic/wedge_1x1x1_SteadyStateDiffusion/wedge_1e3_prism_surfaceflux_diagonal.prj
index 9f5603230b393164ea86dff0a4d2b991aab567e3..9b02148d6526169f3e10133d0a1f874f39ef8d57 100644
--- a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1e3_prism_surfaceflux_diagonal.prj
+++ b/Tests/Data/Elliptic/wedge_1x1x1_SteadyStateDiffusion/wedge_1e3_prism_surfaceflux_diagonal.prj
@@ -8,7 +8,7 @@
     </meshes>
     <processes>
         <process>
-            <name>GW23</name>
+            <name>SteadyStateDiffusion</name>
             <type>STEADY_STATE_DIFFUSION</type>
             <integration_order>2</integration_order>
             <process_variables>
@@ -26,7 +26,7 @@
     </processes>
     <time_loop>
         <processes>
-            <process ref="GW23">
+            <process ref="SteadyStateDiffusion">
                 <nonlinear_solver>basic_picard</nonlinear_solver>
                 <convergence_criterion>
                     <type>DeltaX</type>
diff --git a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1.gml b/Tests/Data/Elliptic/wedge_1x1x1_SteadyStateDiffusion/wedge_1x1x1.gml
similarity index 100%
rename from Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1.gml
rename to Tests/Data/Elliptic/wedge_1x1x1_SteadyStateDiffusion/wedge_1x1x1.gml
diff --git a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism.vtu b/Tests/Data/Elliptic/wedge_1x1x1_SteadyStateDiffusion/wedge_1x1x1_1e3_prism.vtu
similarity index 100%
rename from Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism.vtu
rename to Tests/Data/Elliptic/wedge_1x1x1_SteadyStateDiffusion/wedge_1x1x1_1e3_prism.vtu
diff --git a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_bottom.vtu b/Tests/Data/Elliptic/wedge_1x1x1_SteadyStateDiffusion/wedge_1x1x1_1e3_prism_bottom.vtu
similarity index 100%
rename from Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_bottom.vtu
rename to Tests/Data/Elliptic/wedge_1x1x1_SteadyStateDiffusion/wedge_1x1x1_1e3_prism_bottom.vtu
diff --git a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_complete_surface.vtu b/Tests/Data/Elliptic/wedge_1x1x1_SteadyStateDiffusion/wedge_1x1x1_1e3_prism_complete_surface.vtu
similarity index 100%
rename from Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_complete_surface.vtu
rename to Tests/Data/Elliptic/wedge_1x1x1_SteadyStateDiffusion/wedge_1x1x1_1e3_prism_complete_surface.vtu
diff --git a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_complete_surface_specific_flux_t_1.000000.vtu b/Tests/Data/Elliptic/wedge_1x1x1_SteadyStateDiffusion/wedge_1x1x1_1e3_prism_complete_surface_specific_flux_t_1.000000.vtu
similarity index 100%
rename from Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_complete_surface_specific_flux_t_1.000000.vtu
rename to Tests/Data/Elliptic/wedge_1x1x1_SteadyStateDiffusion/wedge_1x1x1_1e3_prism_complete_surface_specific_flux_t_1.000000.vtu
diff --git a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_diagonal-left-front--right-back.vtu b/Tests/Data/Elliptic/wedge_1x1x1_SteadyStateDiffusion/wedge_1x1x1_1e3_prism_diagonal-left-front--right-back.vtu
similarity index 100%
rename from Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_diagonal-left-front--right-back.vtu
rename to Tests/Data/Elliptic/wedge_1x1x1_SteadyStateDiffusion/wedge_1x1x1_1e3_prism_diagonal-left-front--right-back.vtu
diff --git a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_left-front-top-bottom.vtu b/Tests/Data/Elliptic/wedge_1x1x1_SteadyStateDiffusion/wedge_1x1x1_1e3_prism_left-front-top-bottom.vtu
similarity index 100%
rename from Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_left-front-top-bottom.vtu
rename to Tests/Data/Elliptic/wedge_1x1x1_SteadyStateDiffusion/wedge_1x1x1_1e3_prism_left-front-top-bottom.vtu
diff --git a/Tests/FileIO_Qt/TestQtPrjInterface.cpp b/Tests/FileIO_Qt/TestQtPrjInterface.cpp
index 285887a3735694cdfae28517a53e0044c094ed2e..b99a524ab8d9347e288acc999efd3f04535eb460 100644
--- a/Tests/FileIO_Qt/TestQtPrjInterface.cpp
+++ b/Tests/FileIO_Qt/TestQtPrjInterface.cpp
@@ -34,10 +34,10 @@ TEST(TestQtPrjInterface, QtXmlPrjReader)
 
     std::string name =
         TestInfoLib::TestInfo::data_path +
-        "/Elliptic/nonuniform_bc_Groundwaterflow/neumann_nonuniform.prj";
+        "/Elliptic/nonuniform_bc_SteadyStateDiffusion/neumann_nonuniform.prj";
     test_files.push_back({name, 0, 3, 2, 0});
     name = TestInfoLib::TestInfo::data_path +
-           "/Elliptic/nonuniform_bc_Groundwaterflow/neumann_nonuniform.prj";
+           "/Elliptic/nonuniform_bc_SteadyStateDiffusion/neumann_nonuniform.prj";
     test_files.push_back({name, 0, 3, 2, 0});
 
     for (auto& test_file : test_files)