diff --git a/Applications/ApplicationsLib/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp
index ba3a8f21a570a9a50e13eddd5fb83ea3b5d87db0..2dbef5a4c620c882ab33cf8d8feb1223cff4c83d 100644
--- a/Applications/ApplicationsLib/ProjectData.cpp
+++ b/Applications/ApplicationsLib/ProjectData.cpp
@@ -471,7 +471,7 @@ void ProjectData::parseLinearSolvers(BaseLib::ConfigTree const& config)
     //! \ogs_file_param{prj__linear_solvers__linear_solver}
     for (auto conf : config.getConfigSubtreeList("linear_solver"))
     {
-        //! \ogs_file_param{linear_solver__name}
+        //! \ogs_file_param{prj__linear_solvers__linear_solver__name}
         auto const name = conf.getConfigParameter<std::string>("name");
         BaseLib::insertIfKeyUniqueElseError(
             _linear_solvers,
diff --git a/Documentation/ProjectFile/boundary_condition/t_geometrical_set.md b/Documentation/ProjectFile/boundary_condition/t_geometrical_set.md
deleted file mode 100644
index 751623a80a24f1f9cd4da52013cbc32319868be2..0000000000000000000000000000000000000000
--- a/Documentation/ProjectFile/boundary_condition/t_geometrical_set.md
+++ /dev/null
@@ -1,2 +0,0 @@
-The name of the geometrical set (see \ref ogs_file_param__gml__name) in which
-the \ref ogs_file_param__boundary_condition__geometry "geometry" is defined.
diff --git a/Documentation/ProjectFile/i_ProjectFile.md b/Documentation/ProjectFile/i_ProjectFile.md
index b95ed9e4e8d1612de69809f372e61df71b594255..0e580aef74d6544823677d62dd96f288e0a6fe35 100644
--- a/Documentation/ProjectFile/i_ProjectFile.md
+++ b/Documentation/ProjectFile/i_ProjectFile.md
@@ -14,9 +14,9 @@ different prefixes, namely:
    file.<br>
    Usually one can choose one of several cases by specifying the associated
    <tt>&lt;type&gt;</tt> tag in the input file.<br>
-   Example: \ref ogs_file_param__linear_solver
-   and \ref ogs_file_param__parameter__Constant (<tt>&lt;type&gt;Constant&lt;/type&gt;</tt>)
-   vs. \ref ogs_file_param__parameter__MeshNode (<tt>&lt;type&gt;MeshNode&lt;/type&gt;</tt>)
+   Example: \ref ogs_file_param__prj__linear_solvers__linear_solver
+   and \ref ogs_file_param__prj__parameters__parameter__Constant (<tt>&lt;type&gt;Constant&lt;/type&gt;</tt>)
+   vs. \ref ogs_file_param__prj__parameters__parameter__MeshNode (<tt>&lt;type&gt;MeshNode&lt;/type&gt;</tt>)
 
 The input file parameters are documented within a tree structure (cf. the
 navigation tree on the left). This structure resembles the XML document tree of
@@ -48,13 +48,13 @@ prefix:
     <tt>process_variables.process_variable.boundary_conditions.boundary_condition.geometry</tt>.
  2. Cases that distinguish types do not translate to XML tags either.
     They enclose a set of configuration settings that can be used at that specific point.<br>
-    Example: There is a \ref ogs_file_param__parameter__MeshNode "MeshNode"
+    Example: There is a \ref ogs_file_param__prj__parameters__parameter__MeshNode "MeshNode"
     initial condition, which has a \ref
-    ogs_file_param__parameter__MeshNode__field_name "field_name" tag.  I.e., if you
+    ogs_file_param__prj__parameters__parameter__MeshNode__field_name "field_name" tag.  I.e., if you
     configure the MeshNode parameter, you can (or must) specify the XML tag with the
     path <tt>parameters.parameter.field_name</tt> in the project file.<br> A
     MeshNode parameter can be defined by setting the \ref
-    ogs_file_param__parameter__type "parameters.parameter.type" tag to
+    ogs_file_param__prj__parameters__parameter__type "parameters.parameter.type" tag to
     <tt>MeshNode</tt>.
 
 # Further Information
diff --git a/Documentation/ProjectFile/linear_solver/c_linear_solver.md b/Documentation/ProjectFile/linear_solver/c_linear_solver.md
deleted file mode 100644
index 2421001b7de105ef51cf5db89ec0a636d0f37a25..0000000000000000000000000000000000000000
--- a/Documentation/ProjectFile/linear_solver/c_linear_solver.md
+++ /dev/null
@@ -1,6 +0,0 @@
-In this group the configuration of linear solvers is described.
-
-Unlike all other options, there can be configurations for linear solvers from
-the Eigen, LIS, PETSc, etc. libraries at the same time. Which solver will be
-applied in the end is determined by the build configuration of the OGS
-executable.
diff --git a/Documentation/ProjectFile/parameter/Constant/t_value.md b/Documentation/ProjectFile/parameter/Constant/t_value.md
deleted file mode 100644
index 19901f86af7760ddd9a599221ba987aa8613d497..0000000000000000000000000000000000000000
--- a/Documentation/ProjectFile/parameter/Constant/t_value.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Single component constant parameter value.
-
-This is an alternative to the \ref ogs_file_param__parameter__Constant__values
diff --git a/Documentation/ProjectFile/prj/linear_solvers/i_linear_solvers.md b/Documentation/ProjectFile/prj/linear_solvers/i_linear_solvers.md
index b18a1074e7e43a302c36cdf4b4dafea0e8429e32..7ec54badcebefb2b203eeaa7a89c6ed3b0bbaecf 100644
--- a/Documentation/ProjectFile/prj/linear_solvers/i_linear_solvers.md
+++ b/Documentation/ProjectFile/prj/linear_solvers/i_linear_solvers.md
@@ -1 +1,3 @@
-Contains linear solver settings.
+In this group the configuration of linear solvers is described.
+
+The linear solvers are distinguished by their names.
diff --git a/Documentation/ProjectFile/linear_solver/eigen/i_eigen.md b/Documentation/ProjectFile/prj/linear_solvers/linear_solver/eigen/i_eigen.md
similarity index 100%
rename from Documentation/ProjectFile/linear_solver/eigen/i_eigen.md
rename to Documentation/ProjectFile/prj/linear_solvers/linear_solver/eigen/i_eigen.md
diff --git a/Documentation/ProjectFile/linear_solver/eigen/t_error_tolerance.md b/Documentation/ProjectFile/prj/linear_solvers/linear_solver/eigen/t_error_tolerance.md
similarity index 100%
rename from Documentation/ProjectFile/linear_solver/eigen/t_error_tolerance.md
rename to Documentation/ProjectFile/prj/linear_solvers/linear_solver/eigen/t_error_tolerance.md
diff --git a/Documentation/ProjectFile/linear_solver/eigen/t_max_iteration_step.md b/Documentation/ProjectFile/prj/linear_solvers/linear_solver/eigen/t_max_iteration_step.md
similarity index 100%
rename from Documentation/ProjectFile/linear_solver/eigen/t_max_iteration_step.md
rename to Documentation/ProjectFile/prj/linear_solvers/linear_solver/eigen/t_max_iteration_step.md
diff --git a/Documentation/ProjectFile/linear_solver/eigen/t_precon_type.md b/Documentation/ProjectFile/prj/linear_solvers/linear_solver/eigen/t_precon_type.md
similarity index 100%
rename from Documentation/ProjectFile/linear_solver/eigen/t_precon_type.md
rename to Documentation/ProjectFile/prj/linear_solvers/linear_solver/eigen/t_precon_type.md
diff --git a/Documentation/ProjectFile/prj/linear_solvers/linear_solver/eigen/t_scaling.md b/Documentation/ProjectFile/prj/linear_solvers/linear_solver/eigen/t_scaling.md
new file mode 100644
index 0000000000000000000000000000000000000000..5d49d1babfff741efc45b736dd3a0f1915b6efd6
--- /dev/null
+++ b/Documentation/ProjectFile/prj/linear_solvers/linear_solver/eigen/t_scaling.md
@@ -0,0 +1,8 @@
+Enables scaling algorithm to equilibrate rows and column norms in matrices
+for a LU/ILU factorization if the unsupported Eigen modules are available
+through OGS_USE_EIGEN_UNSUPPORTED cmake option.
+
+See following links for detail description:
+ - "Note" in https://eigen.tuxfamily.org/dox/classEigen_1_1SparseLU.html
+ - "Detailed Description" in https://eigen.tuxfamily.org/dox/unsupported/namespaceEigen.html
+ - References : D. Ruiz and B. Ucar, A Symmetry Preserving Algorithm for Matrix Scaling, INRIA Research report RR-7552
diff --git a/Documentation/ProjectFile/linear_solver/eigen/t_solver_type.md b/Documentation/ProjectFile/prj/linear_solvers/linear_solver/eigen/t_solver_type.md
similarity index 100%
rename from Documentation/ProjectFile/linear_solver/eigen/t_solver_type.md
rename to Documentation/ProjectFile/prj/linear_solvers/linear_solver/eigen/t_solver_type.md
diff --git a/Documentation/ProjectFile/prj/linear_solvers/linear_solver/i_linear_solver.md b/Documentation/ProjectFile/prj/linear_solvers/linear_solver/i_linear_solver.md
index 21e2a2010b77c5b24da255a80f74cd6681ef283d..e31a29eeea25564e7991f8c96aa77467585278ab 100644
--- a/Documentation/ProjectFile/prj/linear_solvers/linear_solver/i_linear_solver.md
+++ b/Documentation/ProjectFile/prj/linear_solvers/linear_solver/i_linear_solver.md
@@ -1,3 +1,6 @@
 Defines a single linear solver.
 
-See \ref ogs_file_param__linear_solver.
+Unlike all other options, there can be configurations for linear solvers from
+the Eigen, LIS, PETSc, etc. libraries at the same time. Which solver will be
+applied in the end is determined by the build configuration of the OGS
+executable.
diff --git a/Documentation/ProjectFile/linear_solver/petsc/i_petsc.md b/Documentation/ProjectFile/prj/linear_solvers/linear_solver/petsc/i_petsc.md
similarity index 100%
rename from Documentation/ProjectFile/linear_solver/petsc/i_petsc.md
rename to Documentation/ProjectFile/prj/linear_solvers/linear_solver/petsc/i_petsc.md
diff --git a/Documentation/ProjectFile/linear_solver/petsc/t_parameters.md b/Documentation/ProjectFile/prj/linear_solvers/linear_solver/petsc/t_parameters.md
similarity index 100%
rename from Documentation/ProjectFile/linear_solver/petsc/t_parameters.md
rename to Documentation/ProjectFile/prj/linear_solvers/linear_solver/petsc/t_parameters.md
diff --git a/Documentation/ProjectFile/linear_solver/petsc/t_prefix.md b/Documentation/ProjectFile/prj/linear_solvers/linear_solver/petsc/t_prefix.md
similarity index 100%
rename from Documentation/ProjectFile/linear_solver/petsc/t_prefix.md
rename to Documentation/ProjectFile/prj/linear_solvers/linear_solver/petsc/t_prefix.md
diff --git a/Documentation/ProjectFile/linear_solver/t_lis.md b/Documentation/ProjectFile/prj/linear_solvers/linear_solver/t_lis.md
similarity index 100%
rename from Documentation/ProjectFile/linear_solver/t_lis.md
rename to Documentation/ProjectFile/prj/linear_solvers/linear_solver/t_lis.md
diff --git a/Documentation/ProjectFile/linear_solver/t_name.md b/Documentation/ProjectFile/prj/linear_solvers/linear_solver/t_name.md
similarity index 100%
rename from Documentation/ProjectFile/linear_solver/t_name.md
rename to Documentation/ProjectFile/prj/linear_solvers/linear_solver/t_name.md
diff --git a/Documentation/ProjectFile/prj/nonlinear_solvers/nonlinear_solver/t_linear_solver.md b/Documentation/ProjectFile/prj/nonlinear_solvers/nonlinear_solver/t_linear_solver.md
index 66686d595320bcb3cb0682696664c3d4f8a70bed..106190c28483a20a54c5c24cc56ef463bb667424 100644
--- a/Documentation/ProjectFile/prj/nonlinear_solvers/nonlinear_solver/t_linear_solver.md
+++ b/Documentation/ProjectFile/prj/nonlinear_solvers/nonlinear_solver/t_linear_solver.md
@@ -1,4 +1,4 @@
 Specifies the linear solver used to solve the linearized equation systems.
 
-The linear solver is referenced by \ref ogs_file_param__linear_solver__name
+The linear solver is referenced by \ref ogs_file_param__prj__linear_solvers__linear_solver__name
 "name".
diff --git a/Documentation/ProjectFile/parameter/Constant/c_Constant.md b/Documentation/ProjectFile/prj/parameters/parameter/Constant/c_Constant.md
similarity index 100%
rename from Documentation/ProjectFile/parameter/Constant/c_Constant.md
rename to Documentation/ProjectFile/prj/parameters/parameter/Constant/c_Constant.md
diff --git a/Documentation/ProjectFile/prj/parameters/parameter/Constant/t_value.md b/Documentation/ProjectFile/prj/parameters/parameter/Constant/t_value.md
new file mode 100644
index 0000000000000000000000000000000000000000..3179aec89d30063294f5b9eb07e3af82ab0c8339
--- /dev/null
+++ b/Documentation/ProjectFile/prj/parameters/parameter/Constant/t_value.md
@@ -0,0 +1,3 @@
+Single component constant parameter value.
+
+This is an alternative to the \ref ogs_file_param__prj__parameters__parameter__Constant__values
diff --git a/Documentation/ProjectFile/parameter/Constant/t_values.md b/Documentation/ProjectFile/prj/parameters/parameter/Constant/t_values.md
similarity index 100%
rename from Documentation/ProjectFile/parameter/Constant/t_values.md
rename to Documentation/ProjectFile/prj/parameters/parameter/Constant/t_values.md
diff --git a/Documentation/ProjectFile/parameter/CurveScaled/c_CurveScaled.md b/Documentation/ProjectFile/prj/parameters/parameter/CurveScaled/c_CurveScaled.md
similarity index 100%
rename from Documentation/ProjectFile/parameter/CurveScaled/c_CurveScaled.md
rename to Documentation/ProjectFile/prj/parameters/parameter/CurveScaled/c_CurveScaled.md
diff --git a/Documentation/ProjectFile/parameter/CurveScaled/t_curve.md b/Documentation/ProjectFile/prj/parameters/parameter/CurveScaled/t_curve.md
similarity index 100%
rename from Documentation/ProjectFile/parameter/CurveScaled/t_curve.md
rename to Documentation/ProjectFile/prj/parameters/parameter/CurveScaled/t_curve.md
diff --git a/Documentation/ProjectFile/boundary_condition/Dirichlet/t_parameter.md b/Documentation/ProjectFile/prj/parameters/parameter/CurveScaled/t_parameter.md
similarity index 100%
rename from Documentation/ProjectFile/boundary_condition/Dirichlet/t_parameter.md
rename to Documentation/ProjectFile/prj/parameters/parameter/CurveScaled/t_parameter.md
diff --git a/Documentation/ProjectFile/prj/parameters/parameter/Group/c_Group.md b/Documentation/ProjectFile/prj/parameters/parameter/Group/c_Group.md
new file mode 100644
index 0000000000000000000000000000000000000000..08feb54ca7a0fa9a2945cab34aecc271e2228ff0
--- /dev/null
+++ b/Documentation/ProjectFile/prj/parameters/parameter/Group/c_Group.md
@@ -0,0 +1,5 @@
+Group parameter (also known as a material dependent parameter) defines a
+specific value or values for each of the group ids.
+
+The group_id_property specifies the field in the mesh (MeshLib::Properties) from
+which the group ids are used.
diff --git a/Documentation/ProjectFile/parameter/Group/index_values/i_index_values.md b/Documentation/ProjectFile/prj/parameters/parameter/Group/index_values/i_index_values.md
similarity index 100%
rename from Documentation/ProjectFile/parameter/Group/index_values/i_index_values.md
rename to Documentation/ProjectFile/prj/parameters/parameter/Group/index_values/i_index_values.md
diff --git a/Documentation/ProjectFile/parameter/Group/index_values/t_index.md b/Documentation/ProjectFile/prj/parameters/parameter/Group/index_values/t_index.md
similarity index 100%
rename from Documentation/ProjectFile/parameter/Group/index_values/t_index.md
rename to Documentation/ProjectFile/prj/parameters/parameter/Group/index_values/t_index.md
diff --git a/Documentation/ProjectFile/parameter/Group/index_values/t_value.md b/Documentation/ProjectFile/prj/parameters/parameter/Group/index_values/t_value.md
similarity index 100%
rename from Documentation/ProjectFile/parameter/Group/index_values/t_value.md
rename to Documentation/ProjectFile/prj/parameters/parameter/Group/index_values/t_value.md
diff --git a/Documentation/ProjectFile/parameter/Group/index_values/t_values.md b/Documentation/ProjectFile/prj/parameters/parameter/Group/index_values/t_values.md
similarity index 100%
rename from Documentation/ProjectFile/parameter/Group/index_values/t_values.md
rename to Documentation/ProjectFile/prj/parameters/parameter/Group/index_values/t_values.md
diff --git a/Documentation/ProjectFile/parameter/CurveScaled/t_parameter.md b/Documentation/ProjectFile/prj/parameters/parameter/Group/t_group_id_property.md
similarity index 100%
rename from Documentation/ProjectFile/parameter/CurveScaled/t_parameter.md
rename to Documentation/ProjectFile/prj/parameters/parameter/Group/t_group_id_property.md
diff --git a/Documentation/ProjectFile/parameter/MeshElement/c_MeshElement.md b/Documentation/ProjectFile/prj/parameters/parameter/MeshElement/c_MeshElement.md
similarity index 100%
rename from Documentation/ProjectFile/parameter/MeshElement/c_MeshElement.md
rename to Documentation/ProjectFile/prj/parameters/parameter/MeshElement/c_MeshElement.md
diff --git a/Documentation/ProjectFile/parameter/MeshElement/t_field_name.md b/Documentation/ProjectFile/prj/parameters/parameter/MeshElement/t_field_name.md
similarity index 100%
rename from Documentation/ProjectFile/parameter/MeshElement/t_field_name.md
rename to Documentation/ProjectFile/prj/parameters/parameter/MeshElement/t_field_name.md
diff --git a/Documentation/ProjectFile/parameter/MeshNode/c_MeshNode.md b/Documentation/ProjectFile/prj/parameters/parameter/MeshNode/c_MeshNode.md
similarity index 100%
rename from Documentation/ProjectFile/parameter/MeshNode/c_MeshNode.md
rename to Documentation/ProjectFile/prj/parameters/parameter/MeshNode/c_MeshNode.md
diff --git a/Documentation/ProjectFile/parameter/MeshNode/t_field_name.md b/Documentation/ProjectFile/prj/parameters/parameter/MeshNode/t_field_name.md
similarity index 100%
rename from Documentation/ProjectFile/parameter/MeshNode/t_field_name.md
rename to Documentation/ProjectFile/prj/parameters/parameter/MeshNode/t_field_name.md
diff --git a/Documentation/ProjectFile/parameter/c_parameter.md b/Documentation/ProjectFile/prj/parameters/parameter/i_parameter.md
similarity index 100%
rename from Documentation/ProjectFile/parameter/c_parameter.md
rename to Documentation/ProjectFile/prj/parameters/parameter/i_parameter.md
diff --git a/Documentation/ProjectFile/parameter/t_name.md b/Documentation/ProjectFile/prj/parameters/parameter/t_name.md
similarity index 100%
rename from Documentation/ProjectFile/parameter/t_name.md
rename to Documentation/ProjectFile/prj/parameters/parameter/t_name.md
diff --git a/Documentation/ProjectFile/parameter/t_type.md b/Documentation/ProjectFile/prj/parameters/parameter/t_type.md
similarity index 100%
rename from Documentation/ProjectFile/parameter/t_type.md
rename to Documentation/ProjectFile/prj/parameters/parameter/t_type.md
diff --git a/Documentation/ProjectFile/prj/parameters/t_parameter.md b/Documentation/ProjectFile/prj/parameters/t_parameter.md
deleted file mode 100644
index fa5fb7ffa1f8c90717214e89fd38eb7a00980b70..0000000000000000000000000000000000000000
--- a/Documentation/ProjectFile/prj/parameters/t_parameter.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Defines a single parameter.
-
-See \ref ogs_file_param__parameter.
diff --git a/Documentation/ProjectFile/boundary_condition/Dirichlet/c_Dirichlet.md b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/Dirichlet/c_Dirichlet.md
similarity index 100%
rename from Documentation/ProjectFile/boundary_condition/Dirichlet/c_Dirichlet.md
rename to Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/Dirichlet/c_Dirichlet.md
diff --git a/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/Dirichlet/t_parameter.md b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/Dirichlet/t_parameter.md
new file mode 100644
index 0000000000000000000000000000000000000000..576add64edccf5d980a0ff86143dc43a7109a788
--- /dev/null
+++ b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/Dirichlet/t_parameter.md
@@ -0,0 +1 @@
+\ogs_missing_documentation
diff --git a/Documentation/ProjectFile/boundary_condition/Neumann/c_Neumann.md b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/Neumann/c_Neumann.md
similarity index 100%
rename from Documentation/ProjectFile/boundary_condition/Neumann/c_Neumann.md
rename to Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/Neumann/c_Neumann.md
diff --git a/Documentation/ProjectFile/boundary_condition/Neumann/t_parameter.md b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/Neumann/t_parameter.md
similarity index 100%
rename from Documentation/ProjectFile/boundary_condition/Neumann/t_parameter.md
rename to Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/Neumann/t_parameter.md
diff --git a/Documentation/ProjectFile/boundary_condition/Robin/c_Robin.md b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/Robin/c_Robin.md
similarity index 100%
rename from Documentation/ProjectFile/boundary_condition/Robin/c_Robin.md
rename to Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/Robin/c_Robin.md
diff --git a/Documentation/ProjectFile/boundary_condition/Robin/t_alpha.md b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/Robin/t_alpha.md
similarity index 100%
rename from Documentation/ProjectFile/boundary_condition/Robin/t_alpha.md
rename to Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/Robin/t_alpha.md
diff --git a/Documentation/ProjectFile/boundary_condition/Robin/t_u_0.md b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/Robin/t_u_0.md
similarity index 100%
rename from Documentation/ProjectFile/boundary_condition/Robin/t_u_0.md
rename to Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/Robin/t_u_0.md
diff --git a/Documentation/ProjectFile/boundary_condition/c_boundary_condition.md b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/i_boundary_condition.md
similarity index 100%
rename from Documentation/ProjectFile/boundary_condition/c_boundary_condition.md
rename to Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/i_boundary_condition.md
diff --git a/Documentation/ProjectFile/boundary_condition/t_component.md b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/t_component.md
similarity index 100%
rename from Documentation/ProjectFile/boundary_condition/t_component.md
rename to Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/t_component.md
diff --git a/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/t_geometrical_set.md b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/t_geometrical_set.md
new file mode 100644
index 0000000000000000000000000000000000000000..a8d82d7b1b79920c828d1baeca48b17a388a6e23
--- /dev/null
+++ b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/t_geometrical_set.md
@@ -0,0 +1,4 @@
+The name of the geometrical set (see \ref ogs_file_param__gml__name) in which
+the \ref
+ogs_file_param__prj__process_variables__process_variable__boundary_conditions__boundary_condition__geometry
+"geometry" is defined.
diff --git a/Documentation/ProjectFile/boundary_condition/t_geometry.md b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/t_geometry.md
similarity index 100%
rename from Documentation/ProjectFile/boundary_condition/t_geometry.md
rename to Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/t_geometry.md
diff --git a/Documentation/ProjectFile/boundary_condition/t_type.md b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/t_type.md
similarity index 100%
rename from Documentation/ProjectFile/boundary_condition/t_type.md
rename to Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/t_type.md
diff --git a/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/t_boundary_condition.md b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/t_boundary_condition.md
deleted file mode 100644
index fcf9ace11720b05f89de0d1cceadf9ef42b71d63..0000000000000000000000000000000000000000
--- a/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/t_boundary_condition.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Specifies a single boundary condition.
-
-See \ref ogs_file_param__boundary_condition.
diff --git a/Documentation/ProjectFile/prj/process_variables/process_variable/t_initial_condition.md b/Documentation/ProjectFile/prj/process_variables/process_variable/t_initial_condition.md
index 1c7a5f0950d6fd816e9a6c85cc40c48308875cd4..8ccd0a964f8c686406c88136300a2d05a9a9046d 100644
--- a/Documentation/ProjectFile/prj/process_variables/process_variable/t_initial_condition.md
+++ b/Documentation/ProjectFile/prj/process_variables/process_variable/t_initial_condition.md
@@ -1,6 +1,6 @@
 Initial condition for the process variable.
 
-This setting references a \ref ogs_file_param__parameter "parameter" by name.
+This setting references a \ref ogs_file_param__prj__parameters__parameter "parameter" by name.
 
 The initial values of the process variable are read from the given initial
 condition, i.e., in the very first assembly the values for this process varaible
diff --git a/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp b/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp
index c04c897a6e1e582358065a95330895f6ab801a6b..b00e9c0c550b27967b70a36106481d1b6b5def88 100644
--- a/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp
+++ b/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp
@@ -218,33 +218,33 @@ EigenLinearSolver::~EigenLinearSolver() = default;
 void EigenLinearSolver::setOption(BaseLib::ConfigTree const& option)
 {
     ignoreOtherLinearSolvers(option, "eigen");
-    //! \ogs_file_param{linear_solver__eigen}
+    //! \ogs_file_param{prj__linear_solvers__linear_solver__eigen}
     auto const ptSolver = option.getConfigSubtreeOptional("eigen");
     if (!ptSolver)
         return;
 
     if (auto solver_type =
-            //! \ogs_file_param{linear_solver__eigen__solver_type}
+            //! \ogs_file_param{prj__linear_solvers__linear_solver__eigen__solver_type}
             ptSolver->getConfigParameterOptional<std::string>("solver_type")) {
         _option.solver_type = _option.getSolverType(*solver_type);
     }
     if (auto precon_type =
-            //! \ogs_file_param{linear_solver__eigen__precon_type}
+            //! \ogs_file_param{prj__linear_solvers__linear_solver__eigen__precon_type}
             ptSolver->getConfigParameterOptional<std::string>("precon_type")) {
         _option.precon_type = _option.getPreconType(*precon_type);
     }
     if (auto error_tolerance =
-            //! \ogs_file_param{linear_solver__eigen__error_tolerance}
+            //! \ogs_file_param{prj__linear_solvers__linear_solver__eigen__error_tolerance}
             ptSolver->getConfigParameterOptional<double>("error_tolerance")) {
         _option.error_tolerance = *error_tolerance;
     }
     if (auto max_iteration_step =
-            //! \ogs_file_param{linear_solver__eigen__max_iteration_step}
+            //! \ogs_file_param{prj__linear_solvers__linear_solver__eigen__max_iteration_step}
             ptSolver->getConfigParameterOptional<int>("max_iteration_step")) {
         _option.max_iterations = *max_iteration_step;
     }
     if (auto scaling =
-            //! \ogs_file_param{linear_solver__eigen__scaling}
+            //! \ogs_file_param{prj__linear_solvers__linear_solver__eigen__scaling}
             ptSolver->getConfigParameterOptional<bool>("scaling")) {
 #ifdef USE_EIGEN_UNSUPPORTED
         _option.scaling = *scaling;
diff --git a/MathLib/LinAlg/Lis/LisOption.h b/MathLib/LinAlg/Lis/LisOption.h
index d3313d8d82f02facbf2b4f50bc9b3abde0728609..94d3eac62883567369f72c1162be8098432f7007 100644
--- a/MathLib/LinAlg/Lis/LisOption.h
+++ b/MathLib/LinAlg/Lis/LisOption.h
@@ -44,7 +44,7 @@ struct LisOption
     {
         if (options) {
             ignoreOtherLinearSolvers(*options, "lis");
-            //! \ogs_file_param{linear_solver__lis}
+            //! \ogs_file_param{prj__linear_solvers__linear_solver__lis}
             if (auto s = options->getConfigParameterOptional<std::string>("lis")) {
                 if (!s->empty()) {
                     _option_string += " " + *s;
diff --git a/MathLib/LinAlg/PETSc/PETScLinearSolver.cpp b/MathLib/LinAlg/PETSc/PETScLinearSolver.cpp
index 961678f85bf8d423d9cf039d5cb2ec1463f0a5be..75b1a84db9d803a7ad0261ecd25cb47df314322d 100644
--- a/MathLib/LinAlg/PETSc/PETScLinearSolver.cpp
+++ b/MathLib/LinAlg/PETSc/PETScLinearSolver.cpp
@@ -33,16 +33,16 @@ PETScLinearSolver::PETScLinearSolver(const std::string /*prefix*/,
     if (option) {
         ignoreOtherLinearSolvers(*option, "petsc");
 
-        //! \ogs_file_param{linear_solver__petsc}
+        //! \ogs_file_param{prj__linear_solvers__linear_solver__petsc}
         if (auto const subtree = option->getConfigSubtreeOptional("petsc"))
         {
             if (auto const parameters =
-                //! \ogs_file_param{linear_solver__petsc__parameters}
+                //! \ogs_file_param{prj__linear_solvers__linear_solver__petsc__parameters}
                 subtree->getConfigParameterOptional<std::string>("parameters")) {
                 petsc_options = *parameters;
             }
 
-            //! \ogs_file_param{linear_solver__petsc__prefix}
+            //! \ogs_file_param{prj__linear_solvers__linear_solver__petsc__prefix}
             if (auto const pre = subtree->getConfigParameterOptional<std::string>("prefix")) {
                 if (!pre->empty())
                     prefix = *pre + "_";
diff --git a/ProcessLib/BoundaryCondition/BoundaryCondition.cpp b/ProcessLib/BoundaryCondition/BoundaryCondition.cpp
index a5c96137a50c68d955a164b018274892672ec7f5..8e9645759ee1d347d74b28b8e9db44720dc8b0bf 100644
--- a/ProcessLib/BoundaryCondition/BoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/BoundaryCondition.cpp
@@ -31,7 +31,7 @@ std::unique_ptr<BoundaryCondition> BoundaryConditionBuilder::createBoundaryCondi
     MeshGeoToolsLib::BoundaryElementsSearcher boundary_element_searcher(
         mesh, mesh_node_searcher);
 
-    //! \ogs_file_param{boundary_condition__type}
+    //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__type}
     auto const type = config.config.peekConfigParameter<std::string>("type");
 
     if (type == "Dirichlet")
diff --git a/ProcessLib/BoundaryCondition/DirichletBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/DirichletBoundaryCondition.cpp
index a3201f40c2e07838e172133ebab5d0d5b45031a0..9c5724c7e229a64eda9567556d9f0f885d36eee7 100644
--- a/ProcessLib/BoundaryCondition/DirichletBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/DirichletBoundaryCondition.cpp
@@ -68,10 +68,10 @@ std::unique_ptr<DirichletBoundaryCondition> createDirichletBoundaryCondition(
     const std::vector<std::unique_ptr<ProcessLib::ParameterBase>>& parameters)
 {
     DBUG("Constructing DirichletBoundaryCondition from config.");
-    //! \ogs_file_param{boundary_condition__type}
+    //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__type}
     config.checkConfigParameter("type", "Dirichlet");
 
-    //! \ogs_file_param{boundary_condition__Dirichlet__parameter}
+    //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__Dirichlet__parameter}
     auto const param_name = config.getConfigParameter<std::string>("parameter");
     DBUG("Using parameter %s", param_name.c_str());
 
diff --git a/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.cpp
index 7a4f13dfe295afcb166327c7c9e1d12afe519d00..afca654fcd69d2175d406b778430a94eb4b33bbb 100644
--- a/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.cpp
@@ -23,10 +23,10 @@ std::unique_ptr<NeumannBoundaryCondition> createNeumannBoundaryCondition(
     std::vector<std::unique_ptr<ParameterBase>> const& parameters)
 {
     DBUG("Constructing Neumann BC from config.");
-    //! \ogs_file_param{boundary_condition__type}
+    //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__type}
     config.checkConfigParameter("type", "Neumann");
 
-    //! \ogs_file_param{boundary_condition__Neumann__parameter}
+    //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__Neumann__parameter}
     auto const param_name = config.getConfigParameter<std::string>("parameter");
     DBUG("Using parameter %s", param_name.c_str());
 
diff --git a/ProcessLib/BoundaryCondition/RobinBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/RobinBoundaryCondition.cpp
index 6a3b9e40d168433dc165b1200b885e41a4f6ccbb..342f12344d8bcdbacac962d316914fc38048f17f 100644
--- a/ProcessLib/BoundaryCondition/RobinBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/RobinBoundaryCondition.cpp
@@ -23,12 +23,12 @@ std::unique_ptr<RobinBoundaryCondition> createRobinBoundaryCondition(
     std::vector<std::unique_ptr<ParameterBase>> const& parameters)
 {
     DBUG("Constructing RobinBcConfig from config.");
-    //! \ogs_file_param{boundary_condition__type}
+    //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__type}
     config.checkConfigParameter("type", "Robin");
 
-    //! \ogs_file_param{boundary_condition__Robin__alpha}
+    //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__Robin__alpha}
     auto const alpha_name = config.getConfigParameter<std::string>("alpha");
-    //! \ogs_file_param{boundary_condition__Robin__u_0}
+    //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__Robin__u_0}
     auto const u_0_name = config.getConfigParameter<std::string>("u_0");
 
     auto const& alpha = findParameter<double>(alpha_name, parameters, 1);
diff --git a/ProcessLib/LIE/BoundaryCondition/NeumannBoundaryCondition.cpp b/ProcessLib/LIE/BoundaryCondition/NeumannBoundaryCondition.cpp
index 207150ac4ab063dd8c47290b952f2d51890425e1..bba2b759a8e8cd97e9f293b08e1dd5389210b904 100644
--- a/ProcessLib/LIE/BoundaryCondition/NeumannBoundaryCondition.cpp
+++ b/ProcessLib/LIE/BoundaryCondition/NeumannBoundaryCondition.cpp
@@ -33,10 +33,10 @@ std::unique_ptr<BoundaryCondition> createNeumannBoundaryCondition(
     FractureProperty const& fracture_prop)
 {
     DBUG("Constructing Neumann BC from config.");
-    //! \ogs_file_param{boundary_condition__type}
+    //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__type}
     config.checkConfigParameter("type", "Neumann");
 
-    //! \ogs_file_param{boundary_condition__Neumann__parameter}
+    //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__Neumann__parameter}
     auto const param_name = config.getConfigParameter<std::string>("parameter");
     DBUG("Using parameter %s", param_name.c_str());
 
diff --git a/ProcessLib/Parameter/ConstantParameter.cpp b/ProcessLib/Parameter/ConstantParameter.cpp
index 6c54129088fbbe5082d906137ef05b6440c113db..b3d8993fc1ef8b08fe1eb7e0600f9d0827c6f6a2 100644
--- a/ProcessLib/Parameter/ConstantParameter.cpp
+++ b/ProcessLib/Parameter/ConstantParameter.cpp
@@ -17,14 +17,14 @@ namespace ProcessLib
 std::unique_ptr<ParameterBase> createConstantParameter(
     std::string const& name, BaseLib::ConfigTree const& config)
 {
-    //! \ogs_file_param{parameter__type}
+    //! \ogs_file_param{prj__parameters__parameter__type}
     config.checkConfigParameter("type", "Constant");
 
     // Optional case for single-component variables where the value can be used.
     // If the 'value' tag is found, use it and return. Otherwise continue with
     // then required tag 'values'.
     {
-        //! \ogs_file_param{parameter__Constant__value}
+        //! \ogs_file_param{prj__parameters__parameter__Constant__value}
         auto const value = config.getConfigParameterOptional<double>("value");
 
         if (value)
@@ -37,7 +37,7 @@ std::unique_ptr<ParameterBase> createConstantParameter(
 
     // Value tag not available; continue with required values tag.
     std::vector<double> const values =
-        //! \ogs_file_param{parameter__Constant__values}
+        //! \ogs_file_param{prj__parameters__parameter__Constant__values}
         config.getConfigParameter<std::vector<double>>("values");
 
     if (values.empty())
diff --git a/ProcessLib/Parameter/CurveScaledParameter.cpp b/ProcessLib/Parameter/CurveScaledParameter.cpp
index e90d3e9f11609f6ede1922bad304f0fb4812f84b..8b067f6eff914c80b9f956c8f137238623baa6d3 100644
--- a/ProcessLib/Parameter/CurveScaledParameter.cpp
+++ b/ProcessLib/Parameter/CurveScaledParameter.cpp
@@ -19,10 +19,10 @@ std::unique_ptr<ParameterBase> createCurveScaledParameter(
              std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const&
         curves)
 {
-    //! \ogs_file_param{parameter__type}
+    //! \ogs_file_param{prj__parameters__parameter__type}
     config.checkConfigParameter("type", "CurveScaled");
 
-    //! \ogs_file_param{parameter__CurveScaled__curve}
+    //! \ogs_file_param{prj__parameters__parameter__CurveScaled__curve}
     auto curve_name = config.getConfigParameter<std::string>("curve");
     DBUG("Using curve %s", curve_name.c_str());
 
@@ -30,7 +30,7 @@ std::unique_ptr<ParameterBase> createCurveScaledParameter(
     if (curve_it == curves.end())
         OGS_FATAL("Curve `%s' does not exists.", curve_name.c_str());
 
-    //! \ogs_file_param{parameter__CurveScaled__parameter}
+    //! \ogs_file_param{prj__parameters__parameter__CurveScaled__parameter}
     auto referenced_parameter_name =
             config.getConfigParameter<std::string>("parameter");
     DBUG("Using parameter %s", referenced_parameter_name.c_str());
diff --git a/ProcessLib/Parameter/GroupBasedParameter.cpp b/ProcessLib/Parameter/GroupBasedParameter.cpp
index 93ecc84c73fdbfaceab9e47f0ce7a956f6b3f150..5cc65f5b7f597f1262e2a7ae94d2454dbb5241f2 100644
--- a/ProcessLib/Parameter/GroupBasedParameter.cpp
+++ b/ProcessLib/Parameter/GroupBasedParameter.cpp
@@ -19,11 +19,11 @@ std::unique_ptr<ParameterBase> createGroupBasedParameter(
     std::string const& name, BaseLib::ConfigTree const& config,
     MeshLib::Mesh const& mesh)
 {
-    //! \ogs_file_param{parameter__type}
+    //! \ogs_file_param{prj__parameters__parameter__type}
     config.checkConfigParameter("type", "Group");
 
     // get a property vector of group IDs
-    //! \ogs_file_param{parameter__Group__group_id_property}
+    //! \ogs_file_param{prj__parameters__parameter__Group__group_id_property}
     std::string const group_id_property_name = config.getConfigParameter<std::string>("group_id_property");
     DBUG("Using group_id_property %s", group_id_property_name.c_str());
 
@@ -37,13 +37,13 @@ std::unique_ptr<ParameterBase> createGroupBasedParameter(
     typedef std::vector<double> Values;
     typedef std::pair<int, Values> Index_Values;
     std::vector<Index_Values> vec_index_values;
-    //! \ogs_file_param{parameter__Group__index_values}
+    //! \ogs_file_param{prj__parameters__parameter__Group__index_values}
     for (auto p : config.getConfigSubtreeList("index_values"))
     {
-        //! \ogs_file_param{parameter__Group__index_values__index}
+        //! \ogs_file_param{prj__parameters__parameter__Group__index_values__index}
         auto const index = p.getConfigParameter<int>("index");
         {
-            //! \ogs_file_param{parameter__Group__index_values__value}
+            //! \ogs_file_param{prj__parameters__parameter__Group__index_values__value}
             auto const value = p.getConfigParameterOptional<double>("value");
 
             if (value)
@@ -55,7 +55,7 @@ std::unique_ptr<ParameterBase> createGroupBasedParameter(
         }
 
         // Value tag not available; continue with required values tag.
-        //! \ogs_file_param{parameter__Group__index_values__values}
+        //! \ogs_file_param{prj__parameters__parameter__Group__index_values__values}
         Values const values = p.getConfigParameter<Values>("values");
 
         if (values.empty())
diff --git a/ProcessLib/Parameter/MeshElementParameter.cpp b/ProcessLib/Parameter/MeshElementParameter.cpp
index 3bf3a494eee3ea3b556d22628cdd6a7f6f3a93be..4b0c496998c7a1ba9762946df9be7766df215368 100644
--- a/ProcessLib/Parameter/MeshElementParameter.cpp
+++ b/ProcessLib/Parameter/MeshElementParameter.cpp
@@ -18,9 +18,9 @@ std::unique_ptr<ParameterBase> createMeshElementParameter(
     std::string const& name, BaseLib::ConfigTree const& config,
     MeshLib::Mesh const& mesh)
 {
-    //! \ogs_file_param{parameter__type}
+    //! \ogs_file_param{prj__parameters__parameter__type}
     config.checkConfigParameter("type", "MeshElement");
-    //! \ogs_file_param{parameter__MeshElement__field_name}
+    //! \ogs_file_param{prj__parameters__parameter__MeshElement__field_name}
     auto const field_name = config.getConfigParameter<std::string>("field_name");
     DBUG("Using field_name %s", field_name.c_str());
 
diff --git a/ProcessLib/Parameter/MeshNodeParameter.cpp b/ProcessLib/Parameter/MeshNodeParameter.cpp
index 3470d40cb1b23505b3b5896744e54f2220b68696..3118fc7c0c7da37922ab38304e34e6338f7d591f 100644
--- a/ProcessLib/Parameter/MeshNodeParameter.cpp
+++ b/ProcessLib/Parameter/MeshNodeParameter.cpp
@@ -18,9 +18,9 @@ std::unique_ptr<ParameterBase> createMeshNodeParameter(
     std::string const& name, BaseLib::ConfigTree const& config,
     MeshLib::Mesh const& mesh)
 {
-    //! \ogs_file_param{parameter__type}
+    //! \ogs_file_param{prj__parameters__parameter__type}
     config.checkConfigParameter("type", "MeshNode");
-    //! \ogs_file_param{parameter__MeshNode__field_name}
+    //! \ogs_file_param{prj__parameters__parameter__MeshNode__field_name}
     auto const field_name = config.getConfigParameter<std::string>("field_name");
     DBUG("Using field_name %s", field_name.c_str());
 
diff --git a/ProcessLib/Parameter/Parameter.cpp b/ProcessLib/Parameter/Parameter.cpp
index 5078403cfd456300aa7480c1d94dfa5fdf7f647a..0c7d76ffa831d97c987d194f0283267b3a604002 100644
--- a/ProcessLib/Parameter/Parameter.cpp
+++ b/ProcessLib/Parameter/Parameter.cpp
@@ -27,9 +27,9 @@ std::unique_ptr<ParameterBase> createParameter(
         curves)
 {
 
-    //! \ogs_file_param{parameter__name}
+    //! \ogs_file_param{prj__parameters__parameter__name}
     auto const name = config.getConfigParameter<std::string>("name");
-    //! \ogs_file_param{parameter__type}
+    //! \ogs_file_param{prj__parameters__parameter__type}
     auto const type = config.peekConfigParameter<std::string>("type");
 
     // Create parameter based on the provided type.
diff --git a/ProcessLib/ProcessVariable.cpp b/ProcessLib/ProcessVariable.cpp
index 00b2c6739a81dffc18c48199cfc6156b7e433d81..53543d7cfc1703da7b8b3c0dd7e7c82fd1e30345 100644
--- a/ProcessLib/ProcessVariable.cpp
+++ b/ProcessLib/ProcessVariable.cpp
@@ -49,10 +49,10 @@ ProcessVariable::ProcessVariable(
              bcs_config->getConfigSubtreeList("boundary_condition"))
         {
             auto const geometrical_set_name =
-                    //! \ogs_file_param{boundary_condition__geometrical_set}
+                    //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__geometrical_set}
                     bc_config.getConfigParameter<std::string>("geometrical_set");
             auto const geometry_name =
-                    //! \ogs_file_param{boundary_condition__geometry}
+                    //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__geometry}
                     bc_config.getConfigParameter<std::string>("geometry");
 
             GeoLib::GeoObject const* const geometry =
@@ -69,7 +69,7 @@ ProcessVariable::ProcessVariable(
                 GeoLib::convertGeoTypeToString(geometry->getGeoType()).c_str());
 
             auto component_id =
-                //! \ogs_file_param{boundary_condition__component}
+                //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__component}
                 bc_config.getConfigParameterOptional<int>("component");
 
             if (!component_id)
diff --git a/scripts/doc/append-xml-tags.py b/scripts/doc/append-xml-tags.py
index 11f7a7a94fb59e72d9b6ee2a1a4d4e76b02b6254..98834e36660f9183b7494984bed2366a132912d5 100755
--- a/scripts/doc/append-xml-tags.py
+++ b/scripts/doc/append-xml-tags.py
@@ -36,10 +36,7 @@ docdir    = os.path.join(docauxdir, "dox", "ProjectFile")
 # used to expand documentation entry points to full xml tag paths
 # that are used in the prj file.
 tag_path_expansion_table = {
-    "boundary_condition": "process_variables.process_variable.boundary_conditions.boundary_condition",
-    "linear_solver":      "linear_solvers.linear_solver",
     "process":            "processes.process",
-    "parameter":          "parameters.parameter",
     "prj": "",
 }
 
diff --git a/scripts/doc/linked-xml-file.py b/scripts/doc/linked-xml-file.py
index f598fff0aa5aedc074efe641c73bd7d5661eed13..2c37e4f2493860c6f746253790afcb6edc7d303b 100755
--- a/scripts/doc/linked-xml-file.py
+++ b/scripts/doc/linked-xml-file.py
@@ -34,10 +34,7 @@ docauxdir = os.path.abspath(docauxdir)
 outdir    = os.path.join(docauxdir, "dox", "CTestProjectFiles")
 
 tag_path_expansion_table = {
-    "prj__process_variables__process_variable__boundary_conditions__boundary_condition": "boundary_condition",
-    "prj__linear_solvers__linear_solver":                                                "linear_solver",
     "prj__processes__process":                                                           "process",
-    "prj__parameters__parameter":                                                        "parameter"
 }
 
 indent = "&nbsp;"*2