From 3566e0df387cea9c13d65238942c15c97dee6cb3 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Thu, 28 Jul 2022 12:11:44 +0200
Subject: [PATCH] [codespell] Fix common spelling mistakes pointed out by
 codespell

---
 .gitlab/issue_templates/Release.md            |  2 +-
 bin/doc/generate_parameterlist.py             |  6 ++--
 bin/installdumux.py                           |  6 ++--
 bin/installexternal.py                        |  4 +--
 bin/make_installscript.py                     |  2 +-
 bin/util/make_co2_table.py                    |  4 +--
 cmake/modules/DumuxMacros.cmake               |  2 +-
 cmake/modules/DumuxTestMacros.cmake           |  4 +--
 cmake/modules/FindGLPK.cmake                  |  4 +--
 cmake/modules/FindNLOPT.cmake                 |  4 +--
 doc/doxygen/README.md                         |  2 +-
 doc/doxygen/extradoc/parameterlist.txt        | 34 +++++++++----------
 doc/doxygen/extradoc/parameters.json          | 32 ++++++++---------
 doc/doxygen/mainpage.txt                      |  2 +-
 doc/handbook/0_dumux-handbook.tex             |  2 +-
 doc/handbook/5_developingdumux.tex            |  2 +-
 doc/handbook/5_externaltools.tex              |  4 +--
 doc/handbook/5_scripts.tex                    |  6 ++--
 dumux/adaptive/initializationindicator.hh     |  4 +--
 dumux/assembly/boxlocalassembler.hh           |  6 ++--
 dumux/assembly/cclocalassembler.hh            | 10 +++---
 dumux/assembly/fcdiamondlocalassembler.hh     |  6 ++--
 dumux/assembly/fclocalassembler.hh            |  4 +--
 dumux/assembly/fvassembler.hh                 |  4 +--
 dumux/assembly/jacobianpattern.hh             |  2 +-
 dumux/assembly/partialreassembler.hh          |  2 +-
 dumux/common/cubicspline.hh                   |  2 +-
 dumux/common/dimensionlessnumbers.hh          |  4 +--
 dumux/common/entitymap.hh                     |  2 +-
 dumux/common/fvproblem.hh                     |  4 +--
 dumux/common/fvspatialparams.hh               |  2 +-
 dumux/common/indextraits.hh                   |  2 +-
 dumux/common/integrate.hh                     |  4 +--
 dumux/common/math.hh                          |  8 ++---
 dumux/common/numericdifferentiation.hh        |  6 ++--
 dumux/common/parameters.cc                    |  2 +-
 dumux/common/pointsource.hh                   |  2 +-
 dumux/common/properties.hh                    |  2 +-
 dumux/common/properties/propertysystem.hh     |  4 +--
 dumux/common/reservedblockvector.hh           |  2 +-
 dumux/common/spline.hh                        |  4 +--
 dumux/common/staggeredfvproblem.hh            |  4 +--
 dumux/common/stringutilities.hh               |  2 +-
 dumux/common/tabulated2dfunction.hh           |  6 ++--
 .../box/elementvolumevariables.hh             |  2 +-
 dumux/discretization/box/fvelementgeometry.hh |  2 +-
 dumux/discretization/box/fvgridgeometry.hh    |  4 +--
 dumux/discretization/box/subcontrolvolume.hh  |  2 +-
 .../cellcentered/elementsolution.hh           |  4 +--
 .../cellcentered/mpfa/dualgridindexset.hh     |  2 +-
 .../mpfa/elementvolumevariables.hh            |  2 +-
 .../cellcentered/mpfa/fvelementgeometry.hh    |  4 +--
 .../cellcentered/mpfa/fvgridgeometry.hh       |  4 +--
 .../cellcentered/mpfa/helper.hh               |  2 +-
 .../mpfa/omethod/localassembler.hh            |  2 +-
 .../mpfa/omethod/staticinteractionvolume.hh   |  2 +-
 .../cellcentered/mpfa/scvgradients.hh         |  6 ++--
 .../cellcentered/subcontrolvolume.hh          |  4 +--
 .../tpfa/elementvolumevariables.hh            |  2 +-
 .../cellcentered/tpfa/fvelementgeometry.hh    |  8 ++---
 .../cellcentered/tpfa/fvgridgeometry.hh       |  2 +-
 .../staggered/localintersectionindexmapper.hh |  6 ++--
 .../porenetwork/fvelementgeometry.hh          |  4 +--
 .../porenetwork/gridgeometry.hh               |  6 ++--
 .../porenetwork/subcontrolvolume.hh           |  2 +-
 .../staggered/freeflow/properties.hh          |  2 +-
 .../freeflow/subcontrolvolumeface.hh          |  4 +--
 .../staggered/fvelementgeometry.hh            |  2 +-
 .../staggered/fvgridgeometry.hh               |  2 +-
 .../staggered/subcontrolvolumeface.hh         |  2 +-
 .../subcontrolvolumefacebase.hh               |  2 +-
 dumux/flux/box/fourierslaw.hh                 |  2 +-
 dumux/flux/box/fourierslawnonequilibrium.hh   |  2 +-
 dumux/flux/box/maxwellstefanslaw.hh           |  4 +--
 dumux/flux/ccmpfa/darcyslaw.hh                |  2 +-
 dumux/flux/ccmpfa/fickslaw.hh                 |  4 +--
 dumux/flux/ccmpfa/fourierslaw.hh              |  2 +-
 dumux/flux/cctpfa/maxwellstefanslaw.hh        |  2 +-
 dumux/flux/fickiandiffusioncoefficients.hh    |  2 +-
 dumux/flux/fickslaw.hh                        |  2 +-
 dumux/flux/fickslaw_fwd.hh                    |  2 +-
 dumux/flux/shallowwaterviscousflux.hh         |  2 +-
 .../freeflow/compositional/kepsilonncmodel.hh |  2 +-
 dumux/freeflow/compositional/komegancmodel.hh |  2 +-
 .../compositional/lowrekepsilonncmodel.hh     |  2 +-
 dumux/freeflow/compositional/oneeqncmodel.hh  |  2 +-
 dumux/freeflow/compositional/sstncmodel.hh    |  2 +-
 dumux/freeflow/compositional/zeroeqncmodel.hh |  2 +-
 .../navierstokes/momentum/fluxvariables.hh    |  2 +-
 .../navierstokes/momentum/localresidual.hh    |  2 +-
 dumux/freeflow/navierstokes/problem.hh        |  6 ++--
 .../navierstokes/staggered/fluxvariables.hh   |  8 ++---
 .../navierstokes/staggered/localresidual.hh   |  2 +-
 .../staggered/staggeredupwindhelper.hh        |  4 +--
 .../staggered/velocitygradients.hh            |  2 +-
 dumux/freeflow/rans/problem.hh                |  6 ++--
 dumux/freeflow/rans/zeroeq/problem.hh         |  2 +-
 dumux/geomechanics/elastic/localresidual.hh   |  2 +-
 dumux/geometry/boundingboxtree.hh             |  2 +-
 dumux/geometry/geometricentityset.hh          |  2 +-
 dumux/geometry/geometryintersection.hh        |  2 +-
 dumux/geometry/intersectingentities.hh        |  2 +-
 dumux/geometry/intersectionentityset.hh       |  2 +-
 dumux/io/grid/griddata.hh                     |  4 +--
 dumux/io/grid/gridmanager.hh                  |  2 +-
 dumux/io/grid/gridmanager_alu.hh              |  4 +--
 dumux/io/grid/gridmanager_oned.hh             |  2 +-
 dumux/io/grid/gridmanager_ug.hh               |  2 +-
 dumux/io/grid/porenetwork/griddata.hh         |  6 ++--
 dumux/io/grid/porenetwork/gridmanager.hh      |  2 +-
 .../porenetwork/parametersforgeneratedgrid.hh |  2 +-
 .../structuredlatticegridcreator.hh           |  2 +-
 dumux/io/grid/porenetwork/subgriddata.hh      |  2 +-
 dumux/io/pointcloudvtkwriter.hh               |  2 +-
 dumux/io/rasterimagereader.hh                 |  6 ++--
 dumux/io/vtk/function.hh                      |  2 +-
 dumux/io/vtk/vtkreader.hh                     |  8 ++---
 dumux/io/xml/tinyxml2.h                       |  2 +-
 dumux/linear/istlsolverregistry.hh            |  2 +-
 dumux/linear/matrixconverter.hh               |  8 ++---
 dumux/linear/preconditioners.hh               |  2 +-
 dumux/linear/seqsolverbackend.hh              |  2 +-
 dumux/linear/solver.hh                        |  2 +-
 .../material/binarycoefficients/brine_co2.hh  |  4 +--
 .../electrochemistry/electrochemistryni.hh    |  2 +-
 dumux/material/components/air.hh              |  4 +--
 dumux/material/components/brine.hh            |  2 +-
 dumux/material/components/co2.hh              |  2 +-
 dumux/material/components/h2.hh               |  2 +-
 dumux/material/components/n2.hh               |  2 +-
 dumux/material/components/o2.hh               |  2 +-
 .../material/components/tabulatedcomponent.hh |  2 +-
 dumux/material/constants.hh                   |  4 +--
 .../compositionfromfugacities.hh              |  2 +-
 .../constraintsolvers/immiscibleflash.hh      |  2 +-
 dumux/material/constraintsolvers/ncpflash.hh  |  2 +-
 dumux/material/eos/pengrobinson.hh            |  4 +--
 .../2p/smoothedlinearlaw.hh                   |  2 +-
 .../2p/splinemateriallaw.hh                   |  2 +-
 .../2p/thermalconductivity/johansen.hh        |  6 ++--
 .../2p/thermalconductivity/somerton.hh        |  6 ++--
 .../3p/parkervangenuchten.hh                  |  4 +--
 .../frictionlaws/frictionlaw.hh               |  6 ++--
 .../porenetwork/throat/transmissibility2p.hh  |  4 +--
 dumux/material/fluidstates/pseudo1p2c.hh      |  2 +-
 dumux/material/fluidsystems/2p1c.hh           |  2 +-
 dumux/material/fluidsystems/2pimmiscible.hh   |  4 +--
 dumux/material/fluidsystems/3pimmiscible.hh   |  2 +-
 dumux/material/fluidsystems/brine.hh          |  2 +-
 dumux/material/fluidsystems/brineco2.hh       |  8 ++---
 dumux/material/fluidsystems/h2oair.hh         |  4 +--
 dumux/material/fluidsystems/h2oheavyoil.hh    |  2 +-
 dumux/material/fluidsystems/h2on2.hh          |  2 +-
 dumux/material/fluidsystems/h2on2o2.hh        |  2 +-
 dumux/material/fluidsystems/liquidphase2c.hh  |  2 +-
 dumux/material/fluidsystems/spe5.hh           |  2 +-
 dumux/material/gstatrandomfield.hh            |  2 +-
 .../freeflowporenetwork/couplingconditions.hh |  2 +-
 .../ffmassporenetwork/couplingmanager.hh      |  4 +--
 .../freeflowporenetwork/snappygridmanager.hh  |  4 +--
 .../couplingconditions.hh                     | 12 +++----
 .../ffmasspm/couplingmanager.hh               |  4 +--
 .../boundary/stokesdarcy/couplingdata.hh      | 14 ++++----
 dumux/multidomain/couplingmanager.hh          |  2 +-
 .../couplingmanager1d3d_projection.hh         |  4 +--
 .../embedded/couplingmanagerbase.hh           |  2 +-
 .../embedded/integrationpointsource.hh        |  4 +--
 .../embedded/localrefinementquadrature.hh     |  2 +-
 .../multidomain/facet/box/couplingmanager.hh  |  2 +-
 dumux/multidomain/facet/box/fvgridgeometry.hh |  2 +-
 .../cellcentered/mpfa/interactionvolume.hh    |  2 +-
 .../multidomain/facet/codimonegridadapter.hh  |  4 +--
 dumux/multidomain/facet/enrichmenthelper.hh   |  2 +-
 dumux/multidomain/facet/gmshreader.hh         |  2 +-
 dumux/multidomain/facet/gridmanager.hh        |  2 +-
 dumux/multidomain/facet/vertexmapper.hh       |  2 +-
 dumux/multidomain/fvassembler.hh              |  4 +--
 dumux/multidomain/fvgridgeometry.hh           |  2 +-
 dumux/multidomain/fvgridvariables.hh          |  4 +--
 dumux/multidomain/fvproblem.hh                |  4 +--
 dumux/multidomain/io/vtkoutputmodule.hh       |  6 ++--
 dumux/multidomain/newtonsolver.hh             |  2 +-
 dumux/multidomain/staggeredcouplingmanager.hh |  4 +--
 .../staggeredfreeflow/couplingmanager.hh      |  2 +-
 dumux/multidomain/staggeredtraits.hh          |  2 +-
 .../multidomain/subdomainboxlocalassembler.hh |  4 +--
 .../multidomain/subdomaincclocalassembler.hh  | 14 ++++----
 .../subdomainstaggeredlocalassembler.hh       |  6 ++--
 dumux/multidomain/traits.hh                   |  2 +-
 dumux/porenetwork/1p/model.hh                 |  2 +-
 dumux/porenetwork/2p/invasionstate.hh         |  4 +--
 .../porenetwork/2p/newtonconsistencychecks.hh |  2 +-
 dumux/porenetwork/common/boundaryflux.hh      |  4 +--
 dumux/porenetwork/common/throatproperties.hh  |  4 +--
 .../porousmediumflow/2p/gridadaptindicator.hh |  2 +-
 dumux/porousmediumflow/2p/griddatatransfer.hh |  2 +-
 dumux/porousmediumflow/3p3c/model.hh          |  2 +-
 .../porousmediumflow/3p3c/volumevariables.hh  |  2 +-
 .../boxdfm/fvelementgeometry.hh               |  2 +-
 .../boxdfm/vtkoutputmodule.hh                 |  4 +--
 dumux/porousmediumflow/co2/model.hh           |  2 +-
 .../compositional/localresidual.hh            |  4 +--
 .../fluxvariablescachefiller.hh               |  8 ++---
 .../porousmediumflow/mineralization/model.hh  |  2 +-
 .../nonequilibrium/localresidual.hh           |  6 ++--
 .../nonisothermal/localresidual.hh            |  2 +-
 .../richards/localresidual.hh                 |  2 +-
 .../richards/volumevariables.hh               |  2 +-
 .../richardsnc/volumevariables.hh             |  6 ++--
 .../solidenergy/localresidual.hh              |  2 +-
 .../porousmediumflow/tracer/localresidual.hh  |  6 ++--
 dumux/python/common/fvspatialparams.hh        |  2 +-
 examples/1ptracer/doc/1p.md                   |  8 ++---
 examples/1ptracer/doc/main.md                 |  2 +-
 examples/1ptracer/doc/tracer.md               |  4 +--
 examples/1ptracer/main.cc                     |  2 +-
 examples/1ptracer/properties_1p.hh            |  4 +--
 examples/1ptracer/properties_tracer.hh        |  4 +--
 examples/1ptracer/spatialparams_1p.hh         |  4 +--
 examples/2pinfiltration/doc/2p.md             |  4 +--
 examples/2pinfiltration/doc/main.md           |  2 +-
 examples/2pinfiltration/main.cc               |  2 +-
 examples/2pinfiltration/problem.hh            |  4 +--
 examples/README.md                            |  2 +-
 .../biomineralization/doc/fluidmaterial.md    |  4 +--
 examples/biomineralization/doc/mainfile.md    |  4 +--
 examples/biomineralization/doc/setup.md       | 18 +++++-----
 examples/biomineralization/main.cc            |  4 +--
 .../fluidsystems/biominsimplechemistry.hh     |  6 ++--
 examples/biomineralization/problem.hh         | 12 +++----
 examples/biomineralization/properties.hh      |  4 +--
 examples/biomineralization/spatialparams.hh   |  2 +-
 examples/convert_code_to_doc.py               |  4 +--
 examples/generate_example_docs.py             |  2 +-
 .../doc/upscalinghelper.md                    |  2 +-
 .../porenetwork_upscaling/upscalinghelper.hh  |  2 +-
 examples/shallowwaterfriction/README.md       |  4 +--
 examples/shallowwaterfriction/doc/_intro.md   |  4 +--
 examples/shallowwaterfriction/doc/main.md     |  2 +-
 examples/shallowwaterfriction/doc/swe.md      |  6 ++--
 examples/shallowwaterfriction/main.cc         |  2 +-
 examples/shallowwaterfriction/problem.hh      |  6 ++--
 python/README.md                              |  2 +-
 python/dumux/common/properties.py             |  2 +-
 python/dumux/material/components/__init__.py  |  2 +-
 .../tpfa/test_tpfafvgeometry_nonconforming.cc |  2 +-
 .../staggered/test_staggeredfvgeometry.cc     | 14 ++++----
 .../test_staggered_free_flow_geometry.cc      |  8 ++---
 test/discretization/test_walldistance.cc      |  2 +-
 test/freeflow/navierstokes/angeli/main.cc     |  2 +-
 test/freeflow/navierstokes/channel/1d/main.cc |  2 +-
 test/freeflow/navierstokes/channel/2d/main.cc |  2 +-
 .../navierstokes/channel/2d/problem.hh        |  2 +-
 .../navierstokes/channel/pipe/main.cc         |  2 +-
 test/freeflow/navierstokes/donea/main.cc      |  2 +-
 test/freeflow/navierstokes/kovasznay/main.cc  |  2 +-
 test/freeflow/navierstokes/periodic/main.cc   |  2 +-
 test/freeflow/navierstokesnc/channel/main.cc  |  2 +-
 .../navierstokesnc/densitydrivenflow/main.cc  |  2 +-
 .../navierstokesnc/maxwellstefan/main.cc      |  2 +-
 test/freeflow/rans/main.cc                    |  2 +-
 test/freeflow/ransnc/main.cc                  |  2 +-
 test/freeflow/shallowwater/bowl/main.cc       |  2 +-
 test/freeflow/shallowwater/bowl/problem.hh    |  2 +-
 test/freeflow/shallowwater/dambreak/main.cc   |  2 +-
 .../freeflow/shallowwater/dambreak/problem.hh |  4 +--
 .../shallowwater/roughchannel/main.cc         |  2 +-
 .../shallowwater/roughchannel/problem.hh      |  4 +--
 test/geomechanics/poroelastic/main.cc         |  2 +-
 test/geometry/test_makegeometry.cc            |  4 +--
 .../gridmanager/test_gridmanager_subgrid.cc   |  2 +-
 .../vtk/test_vtk_staggeredfreeflowpvnames.cc  |  2 +-
 .../test_compositionalflash.cc                |  6 ++--
 .../material/fluidsystems/checkfluidsystem.hh |  2 +-
 .../immiscibleflash/test_immiscibleflash.cc   |  2 +-
 test/material/ncpflash/test_ncpflash.cc       |  4 +--
 .../boundary/darcydarcy/1p_1p/main.cc         |  2 +-
 .../boundary/darcydarcy/1p_2p/main.cc         |  2 +-
 .../1p2c_1p2c/diffusionlawcomparison/main.cc  |  2 +-
 .../diffusionlawcomparison/properties.hh      |  2 +-
 .../boundary/stokesdarcy/1p2c_1p2c/main.cc    |  2 +-
 .../stokesdarcy/1p2c_1p2c/properties.hh       |  2 +-
 .../boundary/stokesdarcy/1p2c_2p2c/main.cc    |  2 +-
 .../boundary/stokesdarcy/1p3c_1p3c/main.cc    |  2 +-
 .../stokesdarcy/1p3c_1p3c/properties.hh       |  2 +-
 .../stokesdarcy/1p_1p/convergencetest/main.cc |  2 +-
 .../boundary/stokesdarcy/1p_1p/main.cc        |  2 +-
 .../boundary/stokesdarcy/1p_2p/main.cc        |  2 +-
 .../embedded/1d3d/1p2c_richards2c/main.cc     |  2 +-
 .../embedded/1d3d/1p_1p/convergence.py        |  2 +-
 test/multidomain/embedded/1d3d/1p_1p/main.cc  |  4 +--
 .../embedded/1d3d/1p_richards/main.cc         |  2 +-
 test/multidomain/embedded/2d3d/1p_1p/main.cc  |  4 +--
 .../facet/1p_1p/analytical/convergencetest.py |  2 +-
 .../facet/1p_1p/analytical/main.cc            |  2 +-
 test/multidomain/facet/1p_1p/gravity/main.cc  |  2 +-
 .../facet/1p_1p/linearprofile/main.cc         |  2 +-
 .../facet/1p_1p/threedomain/main.cc           |  2 +-
 test/multidomain/facet/1pnc_1pnc/main.cc      |  2 +-
 test/multidomain/facet/test_vertexmapper.cc   |  4 +--
 test/multidomain/facet/tracer_tracer/main.cc  |  4 +--
 .../tracer_tracer/problem_tracer_lowdim.hh    |  2 +-
 test/multidomain/poromechanics/el1p/main.cc   |  2 +-
 test/multidomain/poromechanics/el2p/main.cc   |  2 +-
 .../1p/noncreepingflow/nonisothermal/main.cc  |  2 +-
 .../1p/noncreepingflow/spatialparams.hh       |  4 +--
 test/porenetwork/1p/nonisothermal/main.cc     |  2 +-
 test/porenetwork/1pnc/main.cc                 |  2 +-
 test/porenetwork/2p/main.cc                   |  2 +-
 test/porenetwork/2p/params.input              |  2 +-
 test/porenetwork/2p/params_ni.input           |  2 +-
 test/porenetwork/2p/static/main.cc            |  2 +-
 .../1p/compressible/instationary/main.cc      |  2 +-
 .../instationary/main_experimental.cc         |  2 +-
 .../1p/compressible/stationary/main.cc        |  2 +-
 .../1p/convergence/analyticsolution/main.cc   |  2 +-
 test/porousmediumflow/1p/fracture2d3d/main.cc |  2 +-
 .../1p/isothermal/CMakeLists.txt              |  2 +-
 test/porousmediumflow/1p/isothermal/main.cc   |  2 +-
 test/porousmediumflow/1p/network1d3d/main.cc  |  2 +-
 .../1p/network1d3d/problem.hh                 |  2 +-
 .../porousmediumflow/1p/nonisothermal/main.cc |  2 +-
 test/porousmediumflow/1p/periodicbc/main.cc   |  2 +-
 .../1p/pointsources/timedependent/main.cc     |  2 +-
 .../1p/pointsources/timeindependent/main.cc   |  2 +-
 .../porousmediumflow/1p/rootbenchmark/main.cc |  2 +-
 .../1pnc/1p2c/isothermal/main.cc              |  2 +-
 .../isothermal/saltwaterintrusion/main.cc     |  2 +-
 .../1p2c/nonisothermal/conduction/main.cc     |  2 +-
 .../1p2c/nonisothermal/conduction/problem.hh  |  2 +-
 .../1p2c/nonisothermal/convection/main.cc     |  2 +-
 .../1p2c/nonisothermal/transientbc/main.cc    |  2 +-
 test/porousmediumflow/1pnc/1p3c/main.cc       |  2 +-
 test/porousmediumflow/1pnc/dispersion/main.cc |  2 +-
 .../1pnc/nonequilibrium/main.cc               |  2 +-
 .../1pnc/nonequilibrium/problem.hh            |  2 +-
 .../1pncmin/nonisothermal/main.cc             |  2 +-
 test/porousmediumflow/2p/adaptive/main.cc     |  2 +-
 test/porousmediumflow/2p/boxdfm/main.cc       |  2 +-
 test/porousmediumflow/2p/cornerpoint/main.cc  |  2 +-
 test/porousmediumflow/2p/fracture/main.cc     |  2 +-
 .../2p/incompressible/main.cc                 |  2 +-
 .../porousmediumflow/2p/nonisothermal/main.cc |  2 +-
 test/porousmediumflow/2p1c/main.cc            |  2 +-
 test/porousmediumflow/2p1c/problem.hh         |  2 +-
 test/porousmediumflow/2p1c/properties.hh      |  2 +-
 .../2p2c/chemicalnonequilibrium/main.cc       |  2 +-
 .../porousmediumflow/2p2c/evaporation/main.cc |  2 +-
 test/porousmediumflow/2p2c/injection/main.cc  |  2 +-
 .../2p2c/mpnccomparison/main.cc               |  2 +-
 test/porousmediumflow/2p2c/waterair/main.cc   |  2 +-
 test/porousmediumflow/2pnc/diffusion/main.cc  |  2 +-
 .../2pncmin/nonisothermal/problem.hh          |  4 +--
 .../2pncmin/nonisothermal/spatialparams.hh    |  4 +--
 test/porousmediumflow/3p/conduction/main.cc   |  2 +-
 .../porousmediumflow/3p/conduction/problem.hh |  2 +-
 test/porousmediumflow/3p/convection/main.cc   |  2 +-
 .../porousmediumflow/3p/convection/problem.hh |  2 +-
 test/porousmediumflow/3p/infiltration/main.cc |  2 +-
 .../porousmediumflow/3p3c/columnxylol/main.cc |  4 +--
 .../3p3c/columnxylol/problem.hh               |  2 +-
 .../3p3c/infiltration/main.cc                 |  4 +--
 test/porousmediumflow/3p3c/kuevette/main.cc   |  4 +--
 test/porousmediumflow/3pwateroil/main.cc      |  2 +-
 test/porousmediumflow/3pwateroil/problem.hh   |  2 +-
 test/porousmediumflow/co2/main.cc             |  2 +-
 test/porousmediumflow/co2/spatialparams.hh    |  2 +-
 .../mpnc/2p2ccomparison/main.cc               |  2 +-
 test/porousmediumflow/mpnc/kinetic/main.cc    |  2 +-
 test/porousmediumflow/mpnc/kinetic/problem.hh |  6 ++--
 test/porousmediumflow/mpnc/obstacle/main.cc   |  2 +-
 .../mpnc/thermalnonequilibrium/main.cc        |  2 +-
 .../richards/analytical/RichardsAnalytical.m  |  4 +--
 .../richards/analytical/main.cc               |  2 +-
 .../richards/annulus/problem.hh               |  8 ++---
 .../richards/benchmarks/analytical.hh         |  2 +-
 .../richards/benchmarks/main.cc               |  2 +-
 test/porousmediumflow/richards/lens/main.cc   |  2 +-
 .../richards/nonisothermal/conduction/main.cc |  2 +-
 .../nonisothermal/conduction/problem.hh       |  2 +-
 .../richards/nonisothermal/convection/main.cc |  2 +-
 .../nonisothermal/evaporation/main.cc         |  2 +-
 test/porousmediumflow/richardsnc/main.cc      |  2 +-
 test/porousmediumflow/solidenergy/main.cc     |  2 +-
 test/porousmediumflow/tracer/2ptracer/main.cc |  2 +-
 test/porousmediumflow/tracer/constvel/main.cc |  2 +-
 .../tracer/multiphase/main.cc                 |  2 +-
 387 files changed, 621 insertions(+), 621 deletions(-)

diff --git a/.gitlab/issue_templates/Release.md b/.gitlab/issue_templates/Release.md
index 7ecaecb2af..8463f9058a 100644
--- a/.gitlab/issue_templates/Release.md
+++ b/.gitlab/issue_templates/Release.md
@@ -35,7 +35,7 @@ __Hard Feature Freeze!__
 - [ ]  Update all install scripts and the install text in the handbook
 - [ ]  Header check (run `make headercheck`)
 - [ ]  Re-generate parameter list (`bin/doc/generate_parameterlist.py`) and check log file (maybe manual updates to `bin/doc/docextra/parameters.json` are needed)
-- [ ]  Make sure the CMakeLists.txt in `dumux` subfolder are up-to-date (generated with `bin/utils/create_cmakelists.py`, dumux `make install` should result in a useable installed dumux version)
+- [ ]  Make sure the CMakeLists.txt in `dumux` subfolder are up-to-date (generated with `bin/utils/create_cmakelists.py`, dumux `make install` should result in a usable installed dumux version)
 - [ ]  Create release branches
 - [ ]  Configure CI to test release branch
 - [ ]  Local Testing (different compilers and dependency setups)
diff --git a/bin/doc/generate_parameterlist.py b/bin/doc/generate_parameterlist.py
index 4943e16b3a..56f1f9b20b 100644
--- a/bin/doc/generate_parameterlist.py
+++ b/bin/doc/generate_parameterlist.py
@@ -113,7 +113,7 @@ def getEnclosedContent(string, openKey, closeKey):
     # cut off everything before the first occurrence of openKey
     string = openKey + string.partition(openKey)[2]
 
-    # get content between mathing pair
+    # get content between matching pair
     rest = string.partition(closeKey)
     result, rest = rest[0] + closeKey, rest[2]
     while result.count(openKey) != result.count(closeKey):
@@ -295,7 +295,7 @@ for key in parameterDict:
     # we prefer the default value from input
     # otherwise use the first entry that is not None
     # and write the others in log for possible manual editing
-    # determin multiple entries in input
+    # determine multiple entries in input
     paramName = group + "." + parameter
     if paramName in inputDict:
         NUM_ENTRIES = max(
@@ -445,7 +445,7 @@ HEADER = """/*!
  *\\file
  *\\ingroup Parameter
  *
- *\\brief List of currently useable run-time parameters
+ *\\brief List of currently usable run-time parameters
  *
  * The listed run-time parameters are available in general,
  * but we point out that a certain model might not be able
diff --git a/bin/installdumux.py b/bin/installdumux.py
index a0abe7c25d..474c565ae0 100755
--- a/bin/installdumux.py
+++ b/bin/installdumux.py
@@ -51,7 +51,7 @@ def checkCppVersion():
     requiredversion = "7"
     result = subprocess.check_output(["g++", "-dumpversion"]).decode().strip()
     if _Version(result) < _Version(requiredversion):
-        print("-- An error occured while checking for prerequistes.")
+        print("-- An error occurred while checking for prerequistes.")
         raise Exception(
             f"g++ greater than or equal to {requiredversion} "
             "is required for dumux releases >=3.2!"
@@ -112,7 +112,7 @@ showMessage("(1/3) Checking all prerequistes: " + " ".join(programs) + "...")
 # check some prerequistes
 for program in programs:
     if which(program) is None:
-        print("-- An error occured while checking for prerequistes.")
+        print("-- An error occurred while checking for prerequistes.")
         raise Exception(f"Program {program} has not been found.")
 
 if which("paraview") is None:
@@ -169,7 +169,7 @@ showMessage(
 # run dunecontrol
 runCommand(command=["./dune-common/bin/dunecontrol", "--opts=dumux/cmake.opts", "all"])
 
-showMessage("(3/3) Step completed. Succesfully configured and built dune and dumux.")
+showMessage("(3/3) Step completed. Successfully configured and built dune and dumux.")
 
 #################################################################
 #################################################################
diff --git a/bin/installexternal.py b/bin/installexternal.py
index a9f59657f1..4d1beb6908 100755
--- a/bin/installexternal.py
+++ b/bin/installexternal.py
@@ -54,7 +54,7 @@ if len(sys.argv) == 1:
 parser = argparse.ArgumentParser(
     prog="installexternal",
     usage="./installexternal.py [OPTIONS] PACKAGES",
-    description="This script downloads extenstions for dumux and dune \
+    description="This script downloads extensions for dumux and dune \
                                      and installs some External Libraries and Modules.",
 )
 parser.register("action", "store_choice", ChoicesAction)
@@ -273,7 +273,7 @@ def installExternal(parameters):
                 # Clone from repo
                 gitClone(EXTERNAL_URLS[package], branch)
                 # Save message to be shown at the end
-                finalMessage.append(f"{package} has been sucessfully cloned.")
+                finalMessage.append(f"{package} has been successfully cloned.")
         else:
             if tarball:
                 finalMessage.append(f"{package} has been already installed.")
diff --git a/bin/make_installscript.py b/bin/make_installscript.py
index bf1c062726..93957a22ef 100755
--- a/bin/make_installscript.py
+++ b/bin/make_installscript.py
@@ -101,7 +101,7 @@ def runMakeInstallScript():
     deps = addDependencyVersions(deps, cmdArgs.get("ignoreuntracked", False))
     printFoundVersionInfo(deps)
 
-    printProgressInfo(["Making patches for unpublished & uncommited changes"])
+    printProgressInfo(["Making patches for unpublished & uncommitted changes"])
     deps = addDependencyPatches(deps)
 
     # actual script generation
diff --git a/bin/util/make_co2_table.py b/bin/util/make_co2_table.py
index 7dc51491de..e00ecb2a4b 100755
--- a/bin/util/make_co2_table.py
+++ b/bin/util/make_co2_table.py
@@ -75,7 +75,7 @@ parser.add_argument(
     required=True,
     type=int,
     help="The number of temperature sampling points."
-    "min_temp ist the first sampling point, max_temp the last.",
+    "min_temp is the first sampling point, max_temp the last.",
 )
 parser.add_argument(
     "-p1", "--min_press", required=True, type=float, help="The minimum pressure in Pascal."
@@ -89,7 +89,7 @@ parser.add_argument(
     required=True,
     type=int,
     help="The number of pressure sampling points."
-    "min_press ist the first sampling point, max_press the last.",
+    "min_press is the first sampling point, max_press the last.",
 )
 cmdArgs = vars(parser.parse_args())
 
diff --git a/cmake/modules/DumuxMacros.cmake b/cmake/modules/DumuxMacros.cmake
index 21299d9aa5..b679f21c36 100644
--- a/cmake/modules/DumuxMacros.cmake
+++ b/cmake/modules/DumuxMacros.cmake
@@ -20,7 +20,7 @@ include(AddKokkosFlags)
 # possibly link against TBB
 # even if an older version is found
 # otherwise we get linker errors
-# beacuse of inconsistencies with
+# because of inconsistencies with
 # dune-common's TBB setup
 find_package(TBB)
 include(AddTBBFlags)
diff --git a/cmake/modules/DumuxTestMacros.cmake b/cmake/modules/DumuxTestMacros.cmake
index e4b8cc77f5..1e0e77c5de 100644
--- a/cmake/modules/DumuxTestMacros.cmake
+++ b/cmake/modules/DumuxTestMacros.cmake
@@ -1,5 +1,5 @@
 # Dumux wrapper for the module that provides tools for testing the Dune way.
-# We have a wrapper to have to possibily of supporting multiple Dune versions.
+# We have a wrapper to have to possibly of supporting multiple Dune versions.
 #
 # .. cmake_function:: dumux_add_test
 #
@@ -146,7 +146,7 @@
 #       first time a test with that label is added.  In some situations it can
 #       depend on the values of cmake cache variables whether a test is added,
 #       and then it can happen that the :code:`build_${target}_tests` target
-#       exists only sometimes.  If your workflow relies on the existance of
+#       exists only sometimes.  If your workflow relies on the existence of
 #       these targets, even if building them just returns successfully without
 #       doing anything, you can ensure they exist by calling
 #       :ref:`dune_declare_test_label` unconditionally.  The label
diff --git a/cmake/modules/FindGLPK.cmake b/cmake/modules/FindGLPK.cmake
index e8261073fc..99ad38f7ba 100644
--- a/cmake/modules/FindGLPK.cmake
+++ b/cmake/modules/FindGLPK.cmake
@@ -4,7 +4,7 @@
 # Variables used by this module which you may want to set:
 # GLPK_ROOT         Path list to search for GLPK
 #
-# Sets the follwing variable:
+# Sets the following variable:
 #
 # GLPK_FOUND           True if GLPK available and usable.
 # GLPK_INCLUDE_DIRS    Path to the GLPK include dirs.
@@ -83,7 +83,7 @@ if(GLPK_FOUND)
   set(GLPK_DUNE_LIBRARIES ${GLPK_LIBRARIES}
     CACHE STRING "Libraries used by DUNE when linking GLPK programs")
 else(GLPK_FOUND)
-  # log errornous result
+  # log erroneous result
   file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
     "Determining location of GLPK failed:\n"
     "Include directory: ${GLPK_INCLUDE_DIRS}\n"
diff --git a/cmake/modules/FindNLOPT.cmake b/cmake/modules/FindNLOPT.cmake
index 45b016f64e..8c313c35c3 100644
--- a/cmake/modules/FindNLOPT.cmake
+++ b/cmake/modules/FindNLOPT.cmake
@@ -4,7 +4,7 @@
 # Variables used by this module which you may want to set:
 # NLOPT_ROOT         Path list to search for NLOPT
 #
-# Sets the follwing variable:
+# Sets the following variable:
 #
 # NLOPT_FOUND           True if NLOPT available and usable.
 # NLOPT_INCLUDE_DIRS    Path to the NLOPT include dirs.
@@ -84,7 +84,7 @@ if(NLOPT_FOUND)
   set(NLOPT_DUNE_LIBRARIES ${NLOPT_LIBRARIES}
     CACHE STRING "Libraries used by DUNE when linking NLOPT programs")
 else(NLOPT_FOUND)
-  # log errornous result
+  # log erroneous result
   file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
     "Determining location of NLOPT failed:\n"
     "Include directory: ${NLOPT_INCLUDE_DIRS}\n"
diff --git a/doc/doxygen/README.md b/doc/doxygen/README.md
index 8eaa6f37da..899734cee3 100644
--- a/doc/doxygen/README.md
+++ b/doc/doxygen/README.md
@@ -11,7 +11,7 @@ The Doxygen for a **file** should look like this:
 ```
 It should always contain the `\file` first.
 The `\ingroup` gives a Group that is as **precise** as possible and is part of the `modules.txt`
-The `\brief` is a **short comment**  on what happens in the file. Alternatively a `\copybrief` could be used. **Make sure the copybrief links to the correct section and is not ambigous!**
+The `\brief` is a **short comment**  on what happens in the file. Alternatively a `\copybrief` could be used. **Make sure the copybrief links to the correct section and is not ambiguous!**
 Additional text could be added similar to the function description.
 
 A class could look like this:
diff --git a/doc/doxygen/extradoc/parameterlist.txt b/doc/doxygen/extradoc/parameterlist.txt
index 8f20eb7c9c..3ea1ceaaba 100644
--- a/doc/doxygen/extradoc/parameterlist.txt
+++ b/doc/doxygen/extradoc/parameterlist.txt
@@ -9,7 +9,7 @@
  *\file
  *\ingroup Parameter
  *
- *\brief List of currently useable run-time parameters
+ *\brief List of currently usable run-time parameters
  *
  * The listed run-time parameters are available in general,
  * but we point out that a certain model might not be able
@@ -27,7 +27,7 @@
  * | \b Assembly          | Multithreading                                | bool                     | true            | Whether to enable multi-threaded assembly                                                                                                              |
  * | Assembly             | NumericDifference.BaseEpsilon                 | Scalar                   | 1e-10           | The basic numeric epsilon used in the differentiation  for deflecting primary variables                                                                |
  * | Assembly             | NumericDifference.PriVarMagnitude             | NumEqVector              | NumEqVector(-1) | The magnitude of the primary variables used for finding a good numeric epsilon for deflecting primary variables.                                       |
- * | Assembly             | NumericDifferenceMethod                       | int                      | -               | The numeric difference method (1: foward differences (default), 0: central differences, -1: backward differences)                                      |
+ * | Assembly             | NumericDifferenceMethod                       | int                      | -               | The numeric difference method (1: forward differences (default), 0: central differences, -1: backward differences)                                      |
  * | \b BinaryCoefficients | GasDiffCoeff                                  | Scalar                   | -               | The binary diffusion coefficient in gas                                                                                                                |
  * | BinaryCoefficients   | LiquidDiffCoeff                               | Scalar                   | -               | The binary diffusion coefficient in liquid                                                                                                             |
  * | \b Brine             | Salinity                                      | Scalar                   | -               | The salinity                                                                                                                                           |
@@ -48,7 +48,7 @@
  * | Component            | LiquidThermalConductivity                     | Scalar                   | -               | Thermal conductivity of the component \f$\mathrm{[W/(m*K)]}\f$ as a liquid.                                                                            |
  * | Component            | MolarMass                                     | Scalar                   | -               | The mass in one mole of the component                                                                                                                  |
  * | Component            | Name                                          | std::string              | "component"     | A human readable name for the component                                                                                                                |
- * | Component            | ReferenceTemperature                          | Scalar                   | 293.15          | The reference termperature in \f$\mathrm{[K]}\f$ used when calculating the specific internal energy of a constant component as a liquid.               |
+ * | Component            | ReferenceTemperature                          | Scalar                   | 293.15          | The reference temperature in \f$\mathrm{[K]}\f$ used when calculating the specific internal energy of a constant component as a liquid.               |
  * | Component            | SolidDensity                                  | Scalar                   | -               | The density of the component in solid state                                                                                                            |
  * | Component            | SolidHeatCapacity                             | Scalar                   | -               | Specific isobaric heat capacity of the component as a solid                                                                                            |
  * | Component            | SolidThermalConductivity                      | Scalar                   | -               | Thermal conductivity of the component as a solid                                                                                                       |
@@ -83,9 +83,9 @@
  * | \b FreeFlow          | EnableDilatationTerm                          | bool                     | false           | For enabling the turbulent dilation term.                                                                                                              |
  * | FreeFlow             | EnableUnsymmetrizedVelocityGradient           | bool                     | false           | For enabling unsymmetrized velocity gradient. If false consider the shear stress caused by the gradient of the velocities normal to our face of interest. |
  * | FreeFlow             | EnableUnsymmetrizedVelocityGradientForBeaversJoseph | bool                     | false           | For enabling unsymmetrized velocity gradient for the Beavers Joseph coupling condition. If true and if the current scvf is on a boundary and if a Dirichlet BC for the pressure or a BJ condition for the slip velocity is set there, assume a tangential velocity gradient of zero along the lateral face. |
- * | FreeFlow             | UseOldTransportingVelocity                    | bool                     | true            | whether to use the old transporting velocity                                                                                                           |
+ * | FreeFlow             | UseOldTransportingVelocity                    | bool                     | true            | Whether to use the old transporting velocity                                                                                                           |
  * | \b Grid              | AddThroatVolumeToPoreVolume                   | bool                     | false           | Whether to add the throat volume to the pore volume.                                                                                                   |
- * | Grid                 | AllowIntersectingDiagonals                    | bool                     | true            | Wether to allow diagonals to intersect in the context of the generation of a structured-lattice pore-network.                                          |
+ * | Grid                 | AllowIntersectingDiagonals                    | bool                     | true            | Whether to allow diagonals to intersect in the context of the generation of a structured-lattice pore-network.                                          |
  * | Grid                 | Angular0/1/2                                  | std::vector<Scalar>      | -               | min/max value for angular coordinate. Cake grids can be created by either specifying Radial,Angular or Axial in all coordinate directions.             |
  * | Grid                 | Axial0/1/2                                    | std::vector<Scalar>      | -               | min/max value for axial coordinate. Cake grids can be created by either specifying Radial,Angular or Axial in all coordinate directions.               |
  * | Grid                 | BoundaryFaceMarker                            | BoundaryList             | -               | With this, the boundary faces can be set in the format xmin xmax ymin ymax (zmin zmax).                                                                |
@@ -102,7 +102,7 @@
  * | Grid                 | CouplingPlaneLowerLeft                        | GlobalPosition           | Grid.LowerLeft  | the lower left point of the coupling plane                                                                                                             |
  * | Grid                 | CouplingPlaneUpperRight                       | GlobalPosition           | -               | The upper right point of the coupling plane. Default value is based on the gridLowerLeft and uses the coordinate of gridUpperRight in the direction parallel to the coupling plane. |
  * | Grid                 | CouplinglineNormal                            | GlobalPosition           | {0,0,1}         | The normal direction of the coupled interface                                                                                                          |
- * | Grid                 | DeletionProbability                           | decltype(directionProbability) | -               | For a non-regular lattice, you must specifiy deletion probabilities for deleting throats in all directions. For example (3D): DeletionProbability = 0.5 0.5 0 0 0 0 0 0 0 0 0 0 0 deletes approximately 50% of all throats in x and y direction, while no deletion in any other direction takes place. In 2D four values are required (x (1,0),y (0,1) and two diagnals through cell midpoint (1,1),(1,-1)). In 3D thirteen values are required (x(1,0,0),y(0,1,0),z(0,0,1), six face diagonals (1,1,0),(1,-1,0),(1,0,1),(1,0,-1),(0,1,1),(0,1,-1) and four diagonals through cell midpoint (1,1,1),(1,1,-1),(-1,1,1),(-1,-1,1). |
+ * | Grid                 | DeletionProbability                           | decltype(directionProbability) | -               | For a non-regular lattice, you must specify deletion probabilities for deleting throats in all directions. For example (3D): DeletionProbability = 0.5 0.5 0 0 0 0 0 0 0 0 0 0 0 deletes approximately 50% of all throats in x and y direction, while no deletion in any other direction takes place. In 2D four values are required (x (1,0),y (0,1) and two diagnals through cell midpoint (1,1),(1,-1)). In 3D thirteen values are required (x(1,0,0),y(0,1,0),z(0,0,1), six face diagonals (1,1,0),(1,-1,0),(1,0,1),(1,0,-1),(0,1,1),(0,1,-1) and four diagonals through cell midpoint (1,1,1),(1,1,-1),(-1,1,1),(-1,-1,1). |
  * | Grid                 | DeletionRandomNumberSeed                      | std::size_t              | -               | A seed for the random number generation for the random deletion of connecting throats.                                                                 |
  * | Grid                 | DomainMarkers                                 | bool                     | false           | Whether the grid managers work with domain markers.                                                                                                    |
  * | Grid                 | DownstreamCells0/1/2                          | std::vector<Int>         | -               | (The number of the user-defined additional points + 1) in each normal direction in the downstream area of a snappy grid.                               |
@@ -135,8 +135,8 @@
  * | Grid                 | PoreGeometry                                  | std::string              | -               | Pore geometry shape. Possibilities are "Square", "Circle", "Cube", "Sphere", "Cylinder", "Tetrahedron", "Octahedron", "Icosahedron" or "Dodecahedron". |
  * | Grid                 | PoreHeight                                    | Scalar                   | -1.0            | A fixed pore height.                                                                                                                                   |
  * | Grid                 | PoreInscribedRadius                           | Scalar                   | -1.0            | If this is set, all pore radii of pore bodies not belonging to a subregion are set to this value. If this is not set, a random radius is set according to a user-specified distribution. |
- * | Grid                 | PoreLabelsToApplyFactorForRadius              | std::vector<int>         | std::vector<int>{} | Lables of pores of pores bodies not belonging to a subregion which should be treated by applying a factor for the radius.                              |
- * | Grid                 | PoreLabelsToSetFixedRadius                    | std::vector<int>         | std::vector<int>{} | Lables of pores of pores bodies not belonging to a subregion which should be treated by setting a fixed radius.                                        |
+ * | Grid                 | PoreLabelsToApplyFactorForRadius              | std::vector<int>         | std::vector<int>{} | Labels of pores of pores bodies not belonging to a subregion which should be treated by applying a factor for the radius.                              |
+ * | Grid                 | PoreLabelsToSetFixedRadius                    | std::vector<int>         | std::vector<int>{} | Labels of pores of pores bodies not belonging to a subregion which should be treated by setting a fixed radius.                                        |
  * | Grid                 | PoreRadiusFactorForLabel                      | std::vector<Scalar>      | std::vector<Scalar>{} | Vector of factors for the radii of the corresponding pores not belonging to a subregion indicated by PoreLabelsToApplyFactorForRadius.                 |
  * | Grid                 | Positions0/1/2                                | std::vector<ctype>       | -               | For a grid with zones, x/y/z-positions of the left of the leftmost zone followed by the right of all zones (from left to right). (assuming x-axis points to the right) |
  * | Grid                 | PriorityList                                  | BoundaryList             | -               | The priority which decides the order the vertices on the boundary are indexed. By default, vertices on min/max faces in x direction have the highest priority, followed by y and z. |
@@ -158,21 +158,21 @@
  * | Grid                 | Subregion0,1,....ParameterRandomNumberSeed    | unsigned int             | std::random_device{}() | If PoreInscribedRadius is not set, this allows to specify a seed to get reproducible results.                                                          |
  * | Grid                 | Subregion0,1,....ParameterType                | std::string              | "lognormal"     | If PoreInscribedRadius is not set, this allows to specify the type of random distribution for the radii. Possible values are "lognormal" and "uniform". |
  * | Grid                 | Subregion0,1,....PoreInscribedRadius          | Scalar                   | -1.0            | If this is set, all pore radii of pore bodies of this subregion are set to this value. If this is not set, a random radius is set according to a user-specified distribution. |
- * | Grid                 | Subregion0,1,....PoreLabelsToApplyFactorForRadius | std::vector<int>         | std::vector<int>{} | Lables of pores of pores bodies within this subregion which should be treated by applying a factor for the radius, case with subregions.               |
- * | Grid                 | Subregion0,1,....PoreLabelsToSetFixedRadius   | std::vector<int>         | std::vector<int>{} | Lables of pores of pores bodies within this subregion which should be treated by setting a fixed radius.                                               |
+ * | Grid                 | Subregion0,1,....PoreLabelsToApplyFactorForRadius | std::vector<int>         | std::vector<int>{} | Labels of pores of pores bodies within this subregion which should be treated by applying a factor for the radius, case with subregions.               |
+ * | Grid                 | Subregion0,1,....PoreLabelsToSetFixedRadius   | std::vector<int>         | std::vector<int>{} | Labels of pores of pores bodies within this subregion which should be treated by setting a fixed radius.                                               |
  * | Grid                 | Subregion0,1,....PoreRadiusFactorForLabel     | std::vector<Scalar>      | std::vector<Scalar>{} | Vector of factors for the radii of the corresponding pores within this subregion indicated by PoreLabelsToApplyFactorForRadius.                        |
  * | Grid                 | Subregion0,1,....StandardDeviationPoreInscribedRadius | Scalar                   | -               | In the case of a lognormal random distribution, this specifies the standard deviation of the pore radius.                                              |
- * | Grid                 | Subregion0,1,....SubstractRadiiFromThroatLength | bool                     | true            | Decide whether to substract the pore radii from the throat length or not for a pore throat belonging to this subregion.                                |
+ * | Grid                 | Subregion0,1,....SubstractRadiiFromThroatLength | bool                     | true            | Decide whether to subtract the pore radii from the throat length or not for a pore throat belonging to this subregion.                                |
  * | Grid                 | Subregion0,1,....ThroatInscribedRadius        | Scalar                   | -1.0            | Radius of a pore throat belonging to this subregion.                                                                                                   |
  * | Grid                 | Subregion0,1,....ThroatInscribedRadiusN       | Scalar                   | 0.1             | Shape parameter for the calculation of the radius of a pore throat belonging to this subregion when ThroatInscribedRadius is not set.                  |
  * | Grid                 | Subregion0,1,....ThroatLength                 | Scalar                   | -1.0            | Length of a pore throat belonging to this subregion.                                                                                                   |
  * | Grid                 | Subregion0,1,....UpperRight                   | GlobalPosition           | -               | Gives the upper right corner position of the subregion grid in the context of a pore-network.                                                          |
- * | Grid                 | SubstractRadiiFromThroatLength                | bool                     | true            | Decide whether to substract the pore radii from the throat length or not for a pore throat not belonging to a subregion.                               |
+ * | Grid                 | SubstractRadiiFromThroatLength                | bool                     | true            | Decide whether to subtract the pore radii from the throat length or not for a pore throat not belonging to a subregion.                               |
  * | Grid                 | ThroatCrossSectionShape                       | std::string              | -               | A geometry that should be used for all throatcrosssections. The possibilities are "ScaleneTriangle", "EquilateralTriangle", "Square", "Rectangle", "Circle", "TwoPlates", "Polygon". |
  * | Grid                 | ThroatHeight                                  | Scalar                   | -               | Throat height for a rectangle-shaped throat cross section.                                                                                             |
  * | Grid                 | ThroatInscribedRadius                         | Scalar                   | -1.0            | Radius of a pore throat not belonging to a subregion.                                                                                                  |
  * | Grid                 | ThroatInscribedRadiusN                        | Scalar                   | 0.1             | Shape parameter for the calculation of the radius of a pore throat not belonging to a subregion when ThroatInscribedRadius is not set.                 |
- * | Grid                 | ThroatLength                                  | Scalar                   | -1.0            | A user-specified fixed throat lenght.                                                                                                                  |
+ * | Grid                 | ThroatLength                                  | Scalar                   | -1.0            | A user-specified fixed throat length.                                                                                                                  |
  * | Grid                 | ThroatShapeFactor                             | Scalar                   | -               | Throat shape factor for a polygonal throat cross section or a scalene triangle one.                                                                    |
  * | Grid                 | UpperRight                                    | GlobalPosition           | -               | The upperright corner of a structured grid                                                                                                             |
  * | Grid                 | UpstreamCells0/1/2                            | std::vector<Int>         | -               | (The number of the user-defined additional points + 1) in each normal direction in the upstream area of a snappy grid.                                 |
@@ -190,7 +190,7 @@
  * | \b LinearSolver      | GMResRestart                                  | int                      | 10              | cycles before restarting                                                                                                                               |
  * | LinearSolver         | MaxIterations                                 | int                      | 250             | The maximum iterations of the linear solver                                                                                                            |
  * | LinearSolver         | MaxOrthogonalizationVectors                   | int                      | 10              | Maximal number of previous vectors which are orthogonalized against the new search direction                                                           |
- * | LinearSolver         | Preconditioner.AmgAccumulationMode            | std::string              | -               | If and how data is agglomerated on coarser level to fewer processors. ("atOnce": do agglomeration once and to one process; "successive": Multiple agglomerations to fewer proceses until all data is on one process; "none": Do no agglomeration at all and solve coarse level iteratively). |
+ * | LinearSolver         | Preconditioner.AmgAccumulationMode            | std::string              | -               | If and how data is agglomerated on coarser level to fewer processors. ("atOnce": do agglomeration once and to one process; "successive": Multiple agglomerations to fewer processes until all data is on one process; "none": Do no agglomeration at all and solve coarse level iteratively). |
  * | LinearSolver         | Preconditioner.AmgAdditive                    | bool                     | -               | Whether to use additive multigrid.                                                                                                                     |
  * | LinearSolver         | Preconditioner.AmgAlpha                       | double                   | -               | Scaling value for marking connections as strong.                                                                                                       |
  * | LinearSolver         | Preconditioner.AmgBeta                        | double                   | -               | Threshold for marking nodes as isolated.                                                                                                               |
@@ -235,8 +235,8 @@
  * | \b MixedDimension    | IntegrationOrder                              | int                      | 1               | The integration order for coupling source                                                                                                              |
  * | MixedDimension       | KernelIntegrationCRL                          | double                   | 0.1             | The characteristic relative length                                                                                                                     |
  * | MixedDimension       | KernelWidthFactor                             | Scalar                   | -               | The kernel width factor                                                                                                                                |
- * | MixedDimension       | NumCircleSegments                             | int                      | -               | The number of circle segements in the context of integration points.                                                                                   |
- * | MixedDimension       | Projection.ConsiderFacesWithinBoundingBoxCoupled | bool                     | false           | determines if all 3D boundary facets within the mesh bounding box should be consideres as coupling                                                     |
+ * | MixedDimension       | NumCircleSegments                             | int                      | -               | The number of circle segments in the context of integration points.                                                                                   |
+ * | MixedDimension       | Projection.ConsiderFacesWithinBoundingBoxCoupled | bool                     | false           | determines if all 3D boundary facets within the mesh bounding box should be considered as coupling                                                     |
  * | MixedDimension       | Projection.CoupledAngleFactor                 | Scalar                   | 0.3             | angle threshold in which to search for coupled elements (angle in radians from surface normal vector)                                                  |
  * | MixedDimension       | Projection.CoupledBoundingBoxShrinkingFactor  | Scalar                   | 1e-2            | if ConsiderFacesWithinBoundingBoxCoupled=true shrink the bounding box in all directions by this factor                                                 |
  * | MixedDimension       | Projection.CoupledRadiusFactor                | Scalar                   | 0.1             | threshold distance in which to search for coupled elements (specified as multiple of radius)                                                           |
@@ -252,7 +252,7 @@
  * | Newton               | EnablePartialReassembly                       | bool                     | false           | Every entity where the primary variables exhibit a relative shift summed up since the last linearization above 'eps' will be reassembled.              |
  * | Newton               | EnableResidualCriterion                       | bool                     | false           | declare convergence if the initial residual is reduced by the factor ResidualReduction                                                                 |
  * | Newton               | EnableShiftCriterion                          | bool                     | true            | For Newton iterations to stop the maximum relative shift abs(uLastIter - uNew)/scalarmax(1.0, abs(uLastIter + uNew)*0.5) is demanded to be below a threshold value. At least two iterations. |
- * | Newton               | LineSearchMinRelaxationFactor                 | Scalar                   | 0.125           | A minimum relaxation factor for the line serach process.                                                                                               |
+ * | Newton               | LineSearchMinRelaxationFactor                 | Scalar                   | 0.125           | A minimum relaxation factor for the line search process.                                                                                               |
  * | Newton               | MaxAbsoluteResidual                           | Scalar                   | 1e-5            | The maximum acceptable absolute residual for declaring convergence                                                                                     |
  * | Newton               | MaxRelativeShift                              | Scalar                   | 1e-8            | Set the maximum acceptable difference of any primary variable between two iterations for declaring convergence                                         |
  * | Newton               | MaxSteps                                      | int                      | 18              | The number of iterations after we give up                                                                                                              |
diff --git a/doc/doxygen/extradoc/parameters.json b/doc/doxygen/extradoc/parameters.json
index f82cb8998c..ffbdb48e06 100644
--- a/doc/doxygen/extradoc/parameters.json
+++ b/doc/doxygen/extradoc/parameters.json
@@ -358,7 +358,7 @@
     },
     "Assembly.NumericDifferenceMethod": {
         "explanation": [
-            "The numeric difference method (1: foward differences (default), 0: central differences, -1: backward differences)"
+            "The numeric difference method (1: forward differences (default), 0: central differences, -1: backward differences)"
         ]
     },
     "BinaryCoefficients.GasDiffCoeff": {
@@ -463,7 +463,7 @@
     },
     "Component.ReferenceTemperature": {
         "explanation": [
-            "The reference termperature in \\f$\\mathrm{[K]}\\f$ used when calculating the specific internal energy of a constant component as a liquid."
+            "The reference temperature in \\f$\\mathrm{[K]}\\f$ used when calculating the specific internal energy of a constant component as a liquid."
         ]
     },
     "Component.SolidDensity": {
@@ -638,7 +638,7 @@
     },
     "FreeFlow.UseOldTransportingVelocity": {
         "explanation": [
-            "whether to use the old transporting velocity"
+            "Whether to use the old transporting velocity"
         ]
     },
     "Grid.AddThroatVolumeToPoreVolume": {
@@ -648,7 +648,7 @@
     },
     "Grid.AllowIntersectingDiagonals": {
         "explanation": [
-            "Wether to allow diagonals to intersect in the context of the generation of a structured-lattice pore-network."
+            "Whether to allow diagonals to intersect in the context of the generation of a structured-lattice pore-network."
         ]
     },
     "Grid.Angular0/1/2": {
@@ -770,7 +770,7 @@
     },
     "Grid.DeletionProbability": {
         "explanation": [
-            "For a non-regular lattice, you must specifiy deletion probabilities for deleting throats in all directions. For example (3D): DeletionProbability = 0.5 0.5 0 0 0 0 0 0 0 0 0 0 0 deletes approximately 50% of all throats in x and y direction, while no deletion in any other direction takes place. In 2D four values are required (x (1,0),y (0,1) and two diagnals through cell midpoint (1,1),(1,-1)). In 3D thirteen values are required (x(1,0,0),y(0,1,0),z(0,0,1), six face diagonals (1,1,0),(1,-1,0),(1,0,1),(1,0,-1),(0,1,1),(0,1,-1) and four diagonals through cell midpoint (1,1,1),(1,1,-1),(-1,1,1),(-1,-1,1)."
+            "For a non-regular lattice, you must specify deletion probabilities for deleting throats in all directions. For example (3D): DeletionProbability = 0.5 0.5 0 0 0 0 0 0 0 0 0 0 0 deletes approximately 50% of all throats in x and y direction, while no deletion in any other direction takes place. In 2D four values are required (x (1,0),y (0,1) and two diagnals through cell midpoint (1,1),(1,-1)). In 3D thirteen values are required (x(1,0,0),y(0,1,0),z(0,0,1), six face diagonals (1,1,0),(1,-1,0),(1,0,1),(1,0,-1),(0,1,1),(0,1,-1) and four diagonals through cell midpoint (1,1,1),(1,1,-1),(-1,1,1),(-1,-1,1)."
         ]
     },
     "Grid.DeletionRandomNumberSeed": {
@@ -1015,7 +1015,7 @@
             "std::vector<int>{}"
         ],
         "explanation": [
-            "Lables of pores of pores bodies not belonging to a subregion which should be treated by applying a factor for the radius."
+            "Labels of pores of pores bodies not belonging to a subregion which should be treated by applying a factor for the radius."
         ],
         "mode": "manual",
         "type": [
@@ -1027,7 +1027,7 @@
             "std::vector<int>{}"
         ],
         "explanation": [
-            "Lables of pores of pores bodies not belonging to a subregion which should be treated by setting a fixed radius."
+            "Labels of pores of pores bodies not belonging to a subregion which should be treated by setting a fixed radius."
         ],
         "mode": "manual",
         "type": [
@@ -1228,7 +1228,7 @@
             "std::vector<int>{}"
         ],
         "explanation": [
-            "Lables of pores of pores bodies within this subregion which should be treated by applying a factor for the radius, case with subregions."
+            "Labels of pores of pores bodies within this subregion which should be treated by applying a factor for the radius, case with subregions."
         ],
         "mode": "manual",
         "type": [
@@ -1240,7 +1240,7 @@
             "std::vector<int>{}"
         ],
         "explanation": [
-            "Lables of pores of pores bodies within this subregion which should be treated by setting a fixed radius."
+            "Labels of pores of pores bodies within this subregion which should be treated by setting a fixed radius."
         ],
         "mode": "manual",
         "type": [
@@ -1276,7 +1276,7 @@
             "true"
         ],
         "explanation": [
-            "Decide whether to substract the pore radii from the throat length or not for a pore throat belonging to this subregion."
+            "Decide whether to subtract the pore radii from the throat length or not for a pore throat belonging to this subregion."
         ],
         "mode": "manual",
         "type": [
@@ -1336,7 +1336,7 @@
             "true"
         ],
         "explanation": [
-            "Decide whether to substract the pore radii from the throat length or not for a pore throat not belonging to a subregion."
+            "Decide whether to subtract the pore radii from the throat length or not for a pore throat not belonging to a subregion."
         ],
         "mode": "manual",
         "type": [
@@ -1379,7 +1379,7 @@
     },
     "Grid.ThroatLength": {
         "explanation": [
-            "A user-specified fixed throat lenght."
+            "A user-specified fixed throat length."
         ]
     },
     "Grid.ThroatShapeFactor": {
@@ -1514,7 +1514,7 @@
             "-"
         ],
         "explanation": [
-            "If and how data is agglomerated on coarser level to fewer processors. (\"atOnce\": do agglomeration once and to one process; \"successive\": Multiple agglomerations to fewer proceses until all data is on one process; \"none\": Do no agglomeration at all and solve coarse level iteratively)."
+            "If and how data is agglomerated on coarser level to fewer processors. (\"atOnce\": do agglomeration once and to one process; \"successive\": Multiple agglomerations to fewer processes until all data is on one process; \"none\": Do no agglomeration at all and solve coarse level iteratively)."
         ],
         "mode": "manual",
         "type": [
@@ -1984,12 +1984,12 @@
     },
     "MixedDimension.NumCircleSegments": {
         "explanation": [
-            "The number of circle segements in the context of integration points."
+            "The number of circle segments in the context of integration points."
         ]
     },
     "MixedDimension.Projection.ConsiderFacesWithinBoundingBoxCoupled": {
         "explanation": [
-            "determines if all 3D boundary facets within the mesh bounding box should be consideres as coupling "
+            "determines if all 3D boundary facets within the mesh bounding box should be considered as coupling "
         ]
     },
     "MixedDimension.Projection.CoupledAngleFactor": {
@@ -2069,7 +2069,7 @@
     },
     "Newton.LineSearchMinRelaxationFactor": {
         "explanation": [
-            "A minimum relaxation factor for the line serach process."
+            "A minimum relaxation factor for the line search process."
         ]
     },
     "Newton.MaxAbsoluteResidual": {
diff --git a/doc/doxygen/mainpage.txt b/doc/doxygen/mainpage.txt
index 4433bc9373..5e1b121fbc 100644
--- a/doc/doxygen/mainpage.txt
+++ b/doc/doxygen/mainpage.txt
@@ -19,7 +19,7 @@ you access to the documentation by category.
 
 \section params Parameters
 
-An overview of all availabe parameters is given in \ref parameterlist.txt.
+An overview of all available parameters is given in \ref parameterlist.txt.
 
 \section features Features
 
diff --git a/doc/handbook/0_dumux-handbook.tex b/doc/handbook/0_dumux-handbook.tex
index d09cd7e881..b6a8b2c013 100644
--- a/doc/handbook/0_dumux-handbook.tex
+++ b/doc/handbook/0_dumux-handbook.tex
@@ -49,7 +49,7 @@
 \newcommand{\DuneVersion}{2.8}
 \newcommand{\DuneOldVersion}{2.7}
 
-% sytles
+% styles
 \newcommand{\nextline}{\par\phantom{a}\vspace*{0.1\textwidth}}
 \newcommand{\snakeline}{\uwave{\mbox{}}}
 \DeclareRobustCommand\Cplusplus{\texorpdfstring{C\nolinebreak[4]\hspace{-.05em}\raisebox{.4ex}{\tiny\bfseries ++}\xspace}{C++}}
diff --git a/doc/handbook/5_developingdumux.tex b/doc/handbook/5_developingdumux.tex
index 2d0b97bc18..d9aec73c22 100644
--- a/doc/handbook/5_developingdumux.tex
+++ b/doc/handbook/5_developingdumux.tex
@@ -67,7 +67,7 @@ To apply a patch in the same directory type:
 $ patch -p1 < PATCHFILE
 \end{lstlisting}
 
-%TODO: currently, no DUNE patches necessary! Thus, this section is commented and the missing refrence would be bad.
+%TODO: currently, no DUNE patches necessary! Thus, this section is commented and the missing reference would be bad.
 % Uncomment the following statement again when patches might be necessary.
 % See \ref{sc:patchingDUNE} if you need to apply patches to \Dumux or \Dune.
 
diff --git a/doc/handbook/5_externaltools.tex b/doc/handbook/5_externaltools.tex
index 8937857c52..6838538120 100644
--- a/doc/handbook/5_externaltools.tex
+++ b/doc/handbook/5_externaltools.tex
@@ -10,7 +10,7 @@ The basic Git commands are:
   \item \texttt{git diff}: to see the actual changes compared to your last commit
   \item \texttt{git pull}: pull changes from the repository; synchronizes the
   repository with your local copy
-  \item \texttt{git push}: push comitted changes to the repository;  synchronizes
+  \item \texttt{git push}: push committed changes to the repository;  synchronizes
   your local copy with the repository
   \item \texttt{git status}: to check which files/folders have been changed
   \item \texttt{git gui}: graphical user interface, helps selecting changes for
@@ -60,7 +60,7 @@ of \texttt{Dumux::GnuplotInterface}, or the header file itself (\texttt{dumux/io
 \subsection{Gstat}
 Gstat is an open source software tool which generates geostatistical random fields (see \url{www.gstat.org}).
 In order to use gstat, execute the \texttt{bin/installexternal.py} from your \Dumux root
-directory or donwload, unpack and install the tarball from the gstat-website.
+directory or download, unpack and install the tarball from the gstat-website.
 Then, rerun cmake (in the second case set \texttt{GSTAT\_ROOT} in your input file to the
 path where gstat is installed).
 
diff --git a/doc/handbook/5_scripts.tex b/doc/handbook/5_scripts.tex
index ce364d7060..27e542f42f 100644
--- a/doc/handbook/5_scripts.tex
+++ b/doc/handbook/5_scripts.tex
@@ -14,7 +14,7 @@ Others can be used to perform post-processing tasks after simulation data has be
   	\begin{itemize}
   		\item The script \texttt{createdockerimage.py} can help to create a docker image to put your work in a container for simple delivery.
 		\item In order to extract the content and dependencies within your model, \texttt{extractmodulepart.py} will collect all headers used to run a specified test and collect them all in a functioning external module.
-		\item To document the exact versions that have been used, the scripts \texttt{getusedversions.py} is available to search each through an existing simulation dumux suite and find the branch, commit hash, and commit date of the current implemention. 
+		\item To document the exact versions that have been used, the scripts \texttt{getusedversions.py} is available to search each through an existing simulation dumux suite and find the branch, commit hash, and commit date of the current implementation. 
 		\item The script \texttt{create\_cmakelists.py} can be used to integrate new header files to the dune/dumux cmake system.
 		\item In order to produce an installscript that will install your repository and its dependencies on another computer, the \texttt{makeinstallscript.py} is available. This script will collect all of the dependencies and their versions using the \texttt{getmoduleinfo.py} and the other scripts listed above and write a script to install a new version in the same configuration. In the past it has been recommended to run the script \texttt{test\_dumux.sh} to ensure that the final dunecontrol and compilation pass have worked. 
   	\end{itemize} 
@@ -24,13 +24,13 @@ Others can be used to perform post-processing tasks after simulation data has be
 Data visualization and post processing is an integral part of any exercise in simulation. A few scripts are available to begin with in the \texttt{postprocessing/} subdirectory. 
 \begin{itemize}
 	\item Paraview data collection scripts: Although there are many tools available within the open-source visualization program paraview (see \ref{ssec:paraview}), performing consistent data collection from your simulations can be tedious when analyzing many output files. The scripts \texttt{exportscreenshot2d.py}, \texttt{extractlinedata.py}, and \texttt{extractpointdataovertime.py} are each scripts that can help to perform paraview data collection commands consistently and each produce easy to use \texttt{.csv} files or images. 
-	\item Error convergence script: When evaluting errors to a reference solution across grid refinements, the L2 error is typically evaluated. A script to help perform this is available in \texttt{l2error.py}.
+	\item Error convergence script: When evaluating errors to a reference solution across grid refinements, the L2 error is typically evaluated. A script to help perform this is available in \texttt{l2error.py}.
 \end{itemize}
 
 \subsection{Testing Scripts:} \label{ssec:testingScripts}
 In order to ensure consistency when developing in dumux, developers are encouraged to introduce unit tests and reference tests that can be run to ensure new code introductions do not break existing functions. While existing simulations should each test something when the \texttt{ctest} command is called, a few scripts exist in the \texttt{testing/} subdirectory to make this simple to develop and quick to evaluate.
 \begin{itemize}
-	\item Run tests: In order to automatically find and run tests that fit a specific critera, the scripts \texttt{findtests.py}, \texttt{runtest.py} and \texttt{runselectedtests.py} each are available. These are each used to automate the testing process.  
+	\item Run tests: In order to automatically find and run tests that fit a specific criteria, the scripts \texttt{findtests.py}, \texttt{runtest.py} and \texttt{runselectedtests.py} each are available. These are each used to automate the testing process.  
 	\item Reference Solution Comparisons: The scripts \texttt{fuzzycomparevtu.py} and \texttt{fuzzycomparedata.py} are both used to compare simulation results against reference simulation results. When running a test, one can use these files to compare the output from the test against reference simulation results. Should these results differ, the difference for each field is shown. These scripts are typically directly called during testing. 
 \end{itemize}
 
diff --git a/dumux/adaptive/initializationindicator.hh b/dumux/adaptive/initializationindicator.hh
index 555edde9b5..19384a21be 100644
--- a/dumux/adaptive/initializationindicator.hh
+++ b/dumux/adaptive/initializationindicator.hh
@@ -58,7 +58,7 @@ public:
 
     /*!
      * \brief Constructor
-     * \note Reads the folloing parameters from the parameter tree
+     * \note Reads the following parameters from the parameter tree
      *       - Adaptive.MinLevel The minimum refinement level
      *       - Adaptive.MaxLevel The maximum refinement level
      *       - Adaptive.RefineAtDirichletBC If to refine at Dirichlet boundaries (default: true)
@@ -100,7 +100,7 @@ public:
     }
 
     /*!
-     * \brief Function to set the minumum/maximum allowed levels.
+     * \brief Function to set the minimum/maximum allowed levels.
      */
     void setLevels(std::size_t minLevel, std::size_t maxLevel)
     {
diff --git a/dumux/assembly/boxlocalassembler.hh b/dumux/assembly/boxlocalassembler.hh
index b8472bae27..81c2dc77ba 100644
--- a/dumux/assembly/boxlocalassembler.hh
+++ b/dumux/assembly/boxlocalassembler.hh
@@ -432,7 +432,7 @@ public:
         const auto& curSol = this->curSol();
         auto&& curElemVolVars = this->curElemVolVars();
 
-        // get the vecor of the acutal element residuals
+        // get the vecor of the actual element residuals
         const auto origResiduals = this->evalLocalResidual();
         const auto origStorageResiduals = this->evalLocalStorageResidual();
 
@@ -540,7 +540,7 @@ public:
         const auto& curElemVolVars = this->curElemVolVars();
         const auto& elemFluxVarsCache = this->elemFluxVarsCache();
 
-        // get the vecor of the acutal element residuals
+        // get the vecor of the actual element residuals
         const auto origResiduals = this->evalLocalResidual();
 
         //////////////////////////////////////////////////////////////////////////////////////////////////
@@ -658,7 +658,7 @@ public:
         const auto& problem = this->problem();
         const auto& curElemVolVars = this->curElemVolVars();
 
-        // get the vecor of the acutal element residuals
+        // get the vecor of the actual element residuals
         const auto origResiduals = this->evalLocalResidual();
 
         //////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/dumux/assembly/cclocalassembler.hh b/dumux/assembly/cclocalassembler.hh
index 06d8447d62..462a9111e9 100644
--- a/dumux/assembly/cclocalassembler.hh
+++ b/dumux/assembly/cclocalassembler.hh
@@ -188,7 +188,7 @@ public:
         auto&& curElemVolVars = this->curElemVolVars();
         auto&& elemFluxVarsCache = this->elemFluxVarsCache();
 
-        // get stencil informations
+        // get stencil information
         const auto globalI = gridGeometry.elementMapper().index(element);
         const auto& connectivityMap = gridGeometry.connectivityMap();
         const auto numNeighbors = connectivityMap[globalI].size();
@@ -242,7 +242,7 @@ public:
         // element solution container to be deflected
         auto elemSol = elementSolution(element, curSol, gridGeometry);
 
-        // derivatives in the neighbors with repect to the current elements
+        // derivatives in the neighbors with respect to the current elements
         // in index 0 we save the derivative of the element residual with respect to it's own dofs
         Residuals partialDerivs(numNeighbors + 1);
 
@@ -280,7 +280,7 @@ public:
 
             // Correct derivative for ghost elements, i.e. set a 1 for the derivative w.r.t. the
             // current primary variable and a 0 elsewhere. As we always solve for a delta of the
-            // solution with repect to the initial one, this results in a delta of 0 for ghosts.
+            // solution with respect to the initial one, this results in a delta of 0 for ghosts.
             if (this->elementIsGhost())
             {
                 partialDerivs[0] = 0.0;
@@ -428,7 +428,7 @@ public:
 
         NumEqVector partialDeriv;
 
-        // derivatives in the neighbors with repect to the current elements
+        // derivatives in the neighbors with respect to the current elements
         for (int pvIdx = 0; pvIdx < numEq; ++pvIdx)
         {
             // reset derivatives of element dof with respect to itself
@@ -453,7 +453,7 @@ public:
             }
 
             // for ghost elements we assemble a 1.0 where the primary variable and zero everywhere else
-            // as we always solve for a delta of the solution with repect to the initial solution this
+            // as we always solve for a delta of the solution with respect to the initial solution this
             // results in a delta of zero for ghosts
             else partialDeriv[pvIdx] = 1.0;
 
diff --git a/dumux/assembly/fcdiamondlocalassembler.hh b/dumux/assembly/fcdiamondlocalassembler.hh
index e8fd8879fb..68dba4d834 100644
--- a/dumux/assembly/fcdiamondlocalassembler.hh
+++ b/dumux/assembly/fcdiamondlocalassembler.hh
@@ -123,7 +123,7 @@ public:
                 // handle residual and matrix entries for parallel runs
                 for (const auto& scv : scvs(this->fvGeometry()))
                 {
-                    // set the matrix entries of all DOFs withing the overlap region (except the border DOF)
+                    // set the matrix entries of all DOFs within the overlap region (except the border DOF)
                     // to 1.0 and the residual entries to 0.0
                     const auto& facet = this->element().template subEntity <1> (scv.indexInElement());
                     if (facet.partitionType() > Dune::BorderEntity) // TODO is this always guaranteed to be correct?
@@ -493,7 +493,7 @@ public:
         const auto& curSol = this->asImp_().curSol();
         auto&& curElemVolVars = this->curElemVolVars();
 
-        // get the vecor of the acutal element residuals
+        // get the vecor of the actual element residuals
         const auto origResiduals = this->evalLocalResidual();
         const auto origStorageResiduals = this->evalLocalStorageResidual();
 
@@ -603,7 +603,7 @@ public:
         const auto& curElemVolVars = this->curElemVolVars();
         const auto& elemFluxVarsCache = this->elemFluxVarsCache();
 
-        // get the vecor of the acutal element residuals
+        // get the vecor of the actual element residuals
         const auto origResiduals = this->evalLocalResidual();
 
         //////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/dumux/assembly/fclocalassembler.hh b/dumux/assembly/fclocalassembler.hh
index 3980220725..f09a175c57 100644
--- a/dumux/assembly/fclocalassembler.hh
+++ b/dumux/assembly/fclocalassembler.hh
@@ -128,7 +128,7 @@ public:
                     if (facet.partitionType() == Dune::BorderEntity)
                         res[scv.dofIndex()] += residual[scv.localDofIndex()];
 
-                    // set the matrix entries of all DOFs withing the overlap region (except the border DOF)
+                    // set the matrix entries of all DOFs within the overlap region (except the border DOF)
                     // to 1.0 and the residual entries to 0.0
                     else
                     {
@@ -669,7 +669,7 @@ public:
         const auto& curElemVolVars = this->curElemVolVars();
         const auto& elemFluxVarsCache = this->elemFluxVarsCache();
 
-        // get the vecor of the acutal element residuals
+        // get the vecor of the actual element residuals
         const auto origResiduals = this->evalLocalResidual();
 
         //////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/dumux/assembly/fvassembler.hh b/dumux/assembly/fvassembler.hh
index 683369af1a..2255786c0f 100644
--- a/dumux/assembly/fvassembler.hh
+++ b/dumux/assembly/fvassembler.hh
@@ -459,7 +459,7 @@ private:
     /*!
      * \brief A method assembling something per element
      * \note Handles exceptions for parallel runs
-     * \throws NumericalProblem on all processes if something throwed during assembly
+     * \throws NumericalProblem on all processes if an exception is thrown during assembly
      */
     template<typename AssembleElementFunc>
     void assemble_(AssembleElementFunc&& assembleElement) const
@@ -494,7 +494,7 @@ private:
             // if we get here, everything worked well on this process
             succeeded = true;
         }
-        // throw exception if a problem ocurred
+        // throw exception if a problem occurred
         catch (NumericalProblem &e)
         {
             std::cout << "rank " << gridView().comm().rank()
diff --git a/dumux/assembly/jacobianpattern.hh b/dumux/assembly/jacobianpattern.hh
index 66fb499e58..d08bebbddd 100644
--- a/dumux/assembly/jacobianpattern.hh
+++ b/dumux/assembly/jacobianpattern.hh
@@ -128,7 +128,7 @@ auto getJacobianPattern(const GridGeometry& gridGeometry)
     const auto& connectivityMap = gridGeometry.connectivityMap();
 
     auto fvGeometry = localView(gridGeometry);
-    // evaluate the acutal pattern
+    // evaluate the actual pattern
     for (const auto& element : elements(gridGeometry.gridView()))
     {
         if(gridGeometry.isCellCenter())
diff --git a/dumux/assembly/partialreassembler.hh b/dumux/assembly/partialreassembler.hh
index 3ac1966a1c..b45334195c 100644
--- a/dumux/assembly/partialreassembler.hh
+++ b/dumux/assembly/partialreassembler.hh
@@ -181,7 +181,7 @@ public:
         }
 
         // at this point we communicate the yellow vertices to the
-        // neighboring processes because a neigbor process may not see
+        // neighboring processes because a neighbor process may not see
         // the red vertex for yellow border vertices
         VectorCommDataHandleMin<VertexMapper, std::vector<EntityColor>, dim>
             minHandle(vertexMapper, vertexColor_);
diff --git a/dumux/common/cubicspline.hh b/dumux/common/cubicspline.hh
index bf06bae262..5264c33379 100644
--- a/dumux/common/cubicspline.hh
+++ b/dumux/common/cubicspline.hh
@@ -50,7 +50,7 @@ public:
     CubicSpline() = default;
 
     /*!
-     * \brief Contruct a natural cubic spline from the control points (x[i], y[i])
+     * \brief Construct a natural cubic spline from the control points (x[i], y[i])
      * \param x a vector of x-coordinates
      * \param y a vector of y-coordinates
      */
diff --git a/dumux/common/dimensionlessnumbers.hh b/dumux/common/dimensionlessnumbers.hh
index be96bbd16c..d7c9db3015 100644
--- a/dumux/common/dimensionlessnumbers.hh
+++ b/dumux/common/dimensionlessnumbers.hh
@@ -37,7 +37,7 @@ namespace Dumux {
 
 /*!
  * \brief A container for possible values of the property for selecting which Nusselt parametrization to choose.
- *        The actual value is set vie the property NusseltFormulation
+ *        The actual value is set via the property NusseltFormulation
  */
 enum class NusseltFormulation
 {
@@ -46,7 +46,7 @@ enum class NusseltFormulation
 
 /*!
  * \brief A container for possible values of the property for selecting which Sherwood parametrization to choose.
- *        The actual value is set vie the property SherwoodFormulation
+ *        The actual value is set via the property SherwoodFormulation
  */
 enum class SherwoodFormulation
 {
diff --git a/dumux/common/entitymap.hh b/dumux/common/entitymap.hh
index 4e39f88c89..31b077cffc 100644
--- a/dumux/common/entitymap.hh
+++ b/dumux/common/entitymap.hh
@@ -48,7 +48,7 @@ public:
     , seeds_(std::move(seeds))
     {}
 
-    //! constructor with all entites of codim
+    //! constructor with all entities of codim
     template<class Mapper>
     EntityMap(const Grid& grid, const Mapper& mapper)
     : grid_(grid)
diff --git a/dumux/common/fvproblem.hh b/dumux/common/fvproblem.hh
index 8daa20e02c..80bf8f2d27 100644
--- a/dumux/common/fvproblem.hh
+++ b/dumux/common/fvproblem.hh
@@ -240,7 +240,7 @@ public:
     }
 
     /*!
-     * \brief If internal Dirichlet contraints are enabled
+     * \brief If internal Dirichlet constraints are enabled
      * Enables / disables internal (non-boundary) Dirichlet constraints. If this is overloaded
      * to return true, the assembler calls problem.hasInternalDirichletConstraint(element, scv).
      * This means you have to implement the following member function
@@ -460,7 +460,7 @@ public:
 
                 // we do an update e.g. used for TimeDependentPointSource
                 pointSource.update(asImp_(), element, fvGeometry, elemVolVars, scv);
-                // call convienience problem interface function
+                // call convenience problem interface function
                 asImp_().pointSource(pointSource, element, fvGeometry, elemVolVars, scv);
                 // at last take care about multiplying with the correct volume
                 pointSource /= volume*pointSource.embeddings();
diff --git a/dumux/common/fvspatialparams.hh b/dumux/common/fvspatialparams.hh
index 2d1bf10dcc..f40329bfe6 100644
--- a/dumux/common/fvspatialparams.hh
+++ b/dumux/common/fvspatialparams.hh
@@ -133,7 +133,7 @@ public:
      * \f$\boldsymbol{g} = ( 0,\dots,\ -9.81)^T \f$,
      * else \f$\boldsymbol{g} = ( 0,\dots, 0)^T \f$.
      *
-     * \param pos the spatial position at which to evaulate the gravity vector
+     * \param pos the spatial position at which to evaluate the gravity vector
      */
     const GravityVector& gravity(const GlobalPosition& pos) const
     { return gravity_; }
diff --git a/dumux/common/indextraits.hh b/dumux/common/indextraits.hh
index dedb1214b5..d5c6c406cb 100644
--- a/dumux/common/indextraits.hh
+++ b/dumux/common/indextraits.hh
@@ -30,7 +30,7 @@ namespace Dumux {
 
 /*!
  * \ingroup Common
- * \brief Struture to define the index types used for grid and local indices.
+ * \brief Structure to define the index types used for grid and local indices.
  * \tparam GridView The grid view type
  */
 template<class GridView>
diff --git a/dumux/common/integrate.hh b/dumux/common/integrate.hh
index 22a1950892..4c757d7eb5 100644
--- a/dumux/common/integrate.hh
+++ b/dumux/common/integrate.hh
@@ -173,7 +173,7 @@ auto integrateL2Error(const GridGeometry& gg,
  * \param gv the grid view
  * \param f the grid function
  * \param order the order of the quadrature rule
- * \note overload for a Dune::Funtions::GridFunction
+ * \note overload for a Dune::Functions::GridFunction
  */
 template<class GridView, class F,
          typename std::enable_if_t<Detail::hasLocalFunction<F>(), int> = 0>
@@ -212,7 +212,7 @@ auto integrateGridFunction(const GridView& gv,
  * \param f the first function
  * \param g the second function
  * \param order the order of the quadrature rule
- * \note overload for a Dune::Funtions::GridFunction
+ * \note overload for a Dune::Functions::GridFunction
  * \note dune functions currently doesn't support composing two functions
  */
 template<class GridView, class F, class G,
diff --git a/dumux/common/math.hh b/dumux/common/math.hh
index 2f4c7cbbda..7abd460af1 100644
--- a/dumux/common/math.hh
+++ b/dumux/common/math.hh
@@ -263,7 +263,7 @@ int invertCubicPolynomial(SolContainer *sol,
     d /= a;
     a = 1;
 
-    // get rid of the quadratic term by subsituting x = t - b/3
+    // get rid of the quadratic term by substituting x = t - b/3
     Scalar p = c - b*b/3;
     Scalar q = d + (2*b*b*b - 9*b*c)/27;
 
@@ -433,7 +433,7 @@ int invertCubicPolynomial(SolContainer *sol,
  * "Larger" in this case means that all the entries of each spacial dimension are
  * larger compared to the reference vector.
  *
- * \param pos Vektor holding the current Position that is to be checked
+ * \param pos Vector holding the current Position that is to be checked
  * \param smallerVec Reference vector, holding the minimum values for comparison.
  */
 template <class Scalar, int dim>
@@ -459,7 +459,7 @@ bool isLarger(const Dune::FieldVector<Scalar, dim> &pos,
  * "Smaller" in this case means that all the entries of each spacial dimension are
  * smaller in comparison with the reference vector.
  *
- * \param pos Vektor holding the current Position that is to be checked
+ * \param pos Vector holding the current Position that is to be checked
  * \param largerVec Reference vector, holding the maximum values for comparison.
  */
 template <class Scalar, int dim>
@@ -488,7 +488,7 @@ bool isSmaller(const Dune::FieldVector<Scalar, dim> &pos,
  * This is comfortable to cheack weather the current position is located inside or
  * outside of a lense with different properties.
  *
- * \param pos Vektor holding the current Position that is to be checked
+ * \param pos Vector holding the current Position that is to be checked
  * \param smallerVec Reference vector, holding the minimum values for comparison.
  * \param largerVec Reference vector, holding the maximum values for comparison.
  */
diff --git a/dumux/common/numericdifferentiation.hh b/dumux/common/numericdifferentiation.hh
index f9792288fc..59945384e0 100644
--- a/dumux/common/numericdifferentiation.hh
+++ b/dumux/common/numericdifferentiation.hh
@@ -54,7 +54,7 @@ public:
     }
 
     /*!
-     * \brief Computes the derivative of a function with repect to a function parameter
+     * \brief Computes the derivative of a function with respect to a function parameter
      * \note Overload using default epsilon computation
      */
     template<class Function, class Scalar, class FunctionEvalType>
@@ -65,14 +65,14 @@ public:
     { partialDerivative(function, x0, derivative, fx0, epsilon(x0), numericDifferenceMethod); }
 
     /*!
-     * \brief Computes the derivative of a function with repect to a function parameter
+     * \brief Computes the derivative of a function with respect to a function parameter
      * \param function The function to derive
      * \param x0 The parameter at which the derivative is ought to be evaluated
      * \param derivative The partial derivative (output)
      * \param fx0 The result of the function evaluated at x0
      * \param eps The numeric epsilon used in the differentiation
      * \param numericDifferenceMethod The numeric difference method
-     *        (1: foward differences (default), 0: central differences, -1: backward differences)
+     *        (1: forward differences (default), 0: central differences, -1: backward differences)
      */
     template<class Function, class Scalar, class FunctionEvalType>
     static void partialDerivative(const Function& function, Scalar x0,
diff --git a/dumux/common/parameters.cc b/dumux/common/parameters.cc
index c460101d23..49049bc611 100644
--- a/dumux/common/parameters.cc
+++ b/dumux/common/parameters.cc
@@ -88,7 +88,7 @@ void Parameters::init(int argc, char **argv,
     defaultParams(defaultParamTree_());
     applyGlobalDefaults_(defaultParamTree_());
 
-    // parse paramters from the command line
+    // parse parameters from the command line
     const auto commandLineArgs = parseCommandLine(argc, argv);
     mergeTree_(paramTree_(), commandLineArgs);
 
diff --git a/dumux/common/pointsource.hh b/dumux/common/pointsource.hh
index 8e45963a5d..7cc312374a 100644
--- a/dumux/common/pointsource.hh
+++ b/dumux/common/pointsource.hh
@@ -271,7 +271,7 @@ private:
 /*!
  * \ingroup Common
  * \brief A helper class calculating a sub control volume to point source map
- * This class uses the bounding box tree implementation to indentify in which
+ * This class uses the bounding box tree implementation to identify in which
  * sub control volume(s) a point source falls.
  */
 class BoundingBoxTreePointSourceHelper
diff --git a/dumux/common/properties.hh b/dumux/common/properties.hh
index 2a7d1fdbb0..838a6ec44a 100644
--- a/dumux/common/properties.hh
+++ b/dumux/common/properties.hh
@@ -176,7 +176,7 @@ template<class TypeTag, class MyTypeTag>
 struct Formulation { using type = UndefinedProperty; };                         //!< The formulation of the model
 // TODO: is this useful? -> everything is a constraint solver just a different type
 template<class TypeTag, class MyTypeTag>
-struct UseConstraintSolver { using type = UndefinedProperty; };                 //!< Whether to use a contraint solver for computing the secondary variables
+struct UseConstraintSolver { using type = UndefinedProperty; };                 //!< Whether to use a constraint solver for computing the secondary variables
 
 // When using the box method in a multi-phase context, an interface solver might be necessary
 template<class TypeTag, class MyTypeTag>
diff --git a/dumux/common/properties/propertysystem.hh b/dumux/common/properties/propertysystem.hh
index 981fb70962..66d2b35976 100644
--- a/dumux/common/properties/propertysystem.hh
+++ b/dumux/common/properties/propertysystem.hh
@@ -140,8 +140,8 @@ template<class TypeTag, template<class,class> class Property, class T>
 struct GetPropOrImpl
 {
     using PT = typename Detail::GetDefined<TypeTag, Property, std::tuple<TypeTag>>::type;
-    struct OT { using type = T; }; // fake property wrapper
-    using type = std::conditional_t<std::is_same_v<PT, UndefinedProperty>, OT, PT>;
+    struct WrapperT { using type = T; }; // fake property wrapper
+    using type = std::conditional_t<std::is_same_v<PT, UndefinedProperty>, WrapperT, PT>;
 };
 
 } // end namespace Dumux::Properties::Detail
diff --git a/dumux/common/reservedblockvector.hh b/dumux/common/reservedblockvector.hh
index 24bf1968ba..7049e647bc 100644
--- a/dumux/common/reservedblockvector.hh
+++ b/dumux/common/reservedblockvector.hh
@@ -55,7 +55,7 @@ public:
 
     ~ReservedBlockVector() = default;
 
-    //! assigment from scalar
+    //! assignment from scalar
     ReservedBlockVector& operator= (const typename BlockType::field_type& v)
     {
        std::fill(this->begin(), this->end(), v);
diff --git a/dumux/common/spline.hh b/dumux/common/spline.hh
index 139acd9278..5ef7196906 100644
--- a/dumux/common/spline.hh
+++ b/dumux/common/spline.hh
@@ -57,7 +57,7 @@ public:
     /*!
      * \brief Default constructor for a spline.
      *
-     * To specfiy the acutal curve, use one of the set() methods.
+     * To specfiy the actual curve, use one of the set() methods.
      */
     Spline()
     { };
@@ -139,7 +139,7 @@ public:
     /*!
      * \brief Default constructor for a spline.
      *
-     * To specfiy the acutal curve, use one of the set() methods.
+     * To specfiy the actual curve, use one of the set() methods.
      */
     Spline()
     { }
diff --git a/dumux/common/staggeredfvproblem.hh b/dumux/common/staggeredfvproblem.hh
index ffc4d6c006..3197fa4ea3 100644
--- a/dumux/common/staggeredfvproblem.hh
+++ b/dumux/common/staggeredfvproblem.hh
@@ -198,7 +198,7 @@ public:
     }
 
 
-    //! Applys the initial cell center solution
+    //! Applies the initial cell center solution
     template<class SolutionVector>
     void applyInitialCellCenterSolution(SolutionVector& sol,
                                         const SubControlVolume& scv,
@@ -212,7 +212,7 @@ public:
             sol[cellCenterIdx][scv.dofIndex()][pvIdx] = initSol[pvIdx + offset];
     }
 
-    //! Applys the initial face solution
+    //! Applies the initial face solution
     template<class SolutionVector>
     void applyInitialFaceSolution(SolutionVector& sol,
                                   const SubControlVolumeFace& scvf,
diff --git a/dumux/common/stringutilities.hh b/dumux/common/stringutilities.hh
index 74b7d6be40..8e195ef268 100644
--- a/dumux/common/stringutilities.hh
+++ b/dumux/common/stringutilities.hh
@@ -62,7 +62,7 @@ std::vector<std::string_view> tokenize(std::string_view str, std::string_view de
 }
 
 /*
- * \brief Split a string at a given seperator string
+ * \brief Split a string at a given separator string
  * \ingroup Common
  * \param str a string to be split
  * \param delim a set of delimiter characters separating the tokens
diff --git a/dumux/common/tabulated2dfunction.hh b/dumux/common/tabulated2dfunction.hh
index 569e5c2eff..5cfa778c59 100644
--- a/dumux/common/tabulated2dfunction.hh
+++ b/dumux/common/tabulated2dfunction.hh
@@ -40,7 +40,7 @@ namespace Dumux {
  * divided into \f$m\f$ and \f$n\f$ sub-intervals and the values of
  * \f$f(x_i, y_j)\f$ need to be provided. Here, \f$x_i\f$ and
  * \f$y_j\f$ are the largest positions of the \f$i\f$-th and
- * \f$j\f$-th intervall. Between these sampling points this tabulation
+ * \f$j\f$-th interval. Between these sampling points this tabulation
  * class uses linear interpolation.
  */
 template<class Scalar>
@@ -108,7 +108,7 @@ public:
      * \brief Return the interval index of a given position on the x-axis.
      *
      * This method returns a *floating point* number. The integer part
-     * should be interpreted as intervall, the decimal places are the
+     * should be interpreted as interval, the decimal places are the
      * position of the x value between the i-th and the (i+1)-th
      * sample point.
      */
@@ -122,7 +122,7 @@ public:
      * \brief Return the interval index of a given position on the y-axis.
      *
      * This method returns a *floating point* number. The integer part
-     * should be interpreted as intervall, the decimal places are the
+     * should be interpreted as interval, the decimal places are the
      * position of the y value between the j-th and the (j+1)-th
      * sample point.
      */
diff --git a/dumux/discretization/box/elementvolumevariables.hh b/dumux/discretization/box/elementvolumevariables.hh
index bfc2d49fb0..1fe216f057 100644
--- a/dumux/discretization/box/elementvolumevariables.hh
+++ b/dumux/discretization/box/elementvolumevariables.hh
@@ -34,7 +34,7 @@ namespace Dumux {
 /*!
  * \ingroup BoxDiscretization
  * \brief The local (stencil) volume variables class for box models
- * \note The class is specilized for versions with and without caching
+ * \note The class is specialized for versions with and without caching
  * \tparam GVV the grid volume variables type
  * \tparam cachingEnabled if the cache is enabled
  */
diff --git a/dumux/discretization/box/fvelementgeometry.hh b/dumux/discretization/box/fvelementgeometry.hh
index 4424e4c641..d7e6b79257 100644
--- a/dumux/discretization/box/fvelementgeometry.hh
+++ b/dumux/discretization/box/fvelementgeometry.hh
@@ -349,7 +349,7 @@ private:
         scvs_.resize(elementGeometry.corners());
         for (LocalIndexType scvLocalIdx = 0; scvLocalIdx < elementGeometry.corners(); ++scvLocalIdx)
         {
-            // get asssociated dof index
+            // get associated dof index
             const auto dofIdxGlobal = gridGeometry().vertexMapper().subIndex(element, scvLocalIdx, dim);
 
             // add scv to the local container
diff --git a/dumux/discretization/box/fvgridgeometry.hh b/dumux/discretization/box/fvgridgeometry.hh
index 868082c9a1..41cce05c93 100644
--- a/dumux/discretization/box/fvgridgeometry.hh
+++ b/dumux/discretization/box/fvgridgeometry.hh
@@ -349,7 +349,7 @@ private:
     std::size_t numScvf_;
     std::size_t numBoundaryScvf_;
 
-    // vertices on the boudary
+    // vertices on the boundary
     std::vector<bool> boundaryDofIndices_;
     std::vector<bool> hasBoundaryScvf_;
 
@@ -554,7 +554,7 @@ private:
     std::size_t numScvf_;
     std::size_t numBoundaryScvf_;
 
-    // vertices on the boudary
+    // vertices on the boundary
     std::vector<bool> boundaryDofIndices_;
 
     // a map for periodic boundary vertices
diff --git a/dumux/discretization/box/subcontrolvolume.hh b/dumux/discretization/box/subcontrolvolume.hh
index f7b8930baf..2b598eb8cc 100644
--- a/dumux/discretization/box/subcontrolvolume.hh
+++ b/dumux/discretization/box/subcontrolvolume.hh
@@ -86,7 +86,7 @@ public:
     //! The default constructor
     BoxSubControlVolume() = default;
 
-    // the contructor in the box case
+    // the constructor in the box case
     template<class GeometryHelper>
     BoxSubControlVolume(const GeometryHelper& geometryHelper,
                         LocalIndexType scvIdx,
diff --git a/dumux/discretization/cellcentered/elementsolution.hh b/dumux/discretization/cellcentered/elementsolution.hh
index c8b23c16c7..94062c24cc 100644
--- a/dumux/discretization/cellcentered/elementsolution.hh
+++ b/dumux/discretization/cellcentered/elementsolution.hh
@@ -138,7 +138,7 @@ auto elementSolution(const Element& element, const ElementVolumeVariables& elemV
 /*!
  * \ingroup CCDiscretization
  * \brief  Make an element solution for cell-centered schemes
- * \note This is e.g. used to contruct an element solution at Dirichlet boundaries
+ * \note This is e.g. used to construct an element solution at Dirichlet boundaries
  */
 template<class FVElementGeometry, class PrimaryVariables>
 auto elementSolution(PrimaryVariables&& priVars)
@@ -152,7 +152,7 @@ auto elementSolution(PrimaryVariables&& priVars)
 /*!
  * \ingroup CCDiscretization
  * \brief  Make an element solution for cell-centered schemes
- * \note This is e.g. used to contruct an element solution at Dirichlet boundaries
+ * \note This is e.g. used to construct an element solution at Dirichlet boundaries
  */
 template<class FVElementGeometry, class PrimaryVariables>
 auto elementSolution(const PrimaryVariables& priVars)
diff --git a/dumux/discretization/cellcentered/mpfa/dualgridindexset.hh b/dumux/discretization/cellcentered/mpfa/dualgridindexset.hh
index c0fa9de3a3..005fdc95d3 100644
--- a/dumux/discretization/cellcentered/mpfa/dualgridindexset.hh
+++ b/dumux/discretization/cellcentered/mpfa/dualgridindexset.hh
@@ -35,7 +35,7 @@ namespace Dumux {
 
 /*!
  * \ingroup CCMpfaDiscretization
- * \brief Default traits to be used in conjuntion
+ * \brief Default traits to be used in conjunction
  *        with the dual grid nodal index set.
  *
  * \tparam GV The grid view type
diff --git a/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh b/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh
index e3a9582a2c..e0e76209ba 100644
--- a/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh
+++ b/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh
@@ -185,7 +185,7 @@ namespace CCMpfa {
 /*!
  * \ingroup CCMpfaDiscretization
  * \brief The local (stencil) volume variables class for cell centered mpfa models
- * \note The class is specilized for versions with and without caching
+ * \note The class is specialized for versions with and without caching
  * \tparam GVV the grid volume variables type
  * \tparam cachingEnabled if the cache is enabled
  */
diff --git a/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh b/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh
index 6ff89884ac..367f22ae95 100644
--- a/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh
+++ b/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh
@@ -223,7 +223,7 @@ public:
     using SubControlVolume = typename GG::SubControlVolume;
     //! export type of subcontrol volume face
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
-    //! export type of finite volume grid geometrys
+    //! export type of finite volume grid geometries
     using GridGeometry = GG;
     //! the maximum number of scvs per element
     static constexpr std::size_t maxNumElementScvs = 1;
@@ -234,7 +234,7 @@ public:
     CCMpfaFVElementGeometry(const GridGeometry& gridGeometry)
     : gridGeometryPtr_(&gridGeometry) {}
 
-    //! Get an elment sub control volume with a global scv index
+    //! Get an element sub control volume with a global scv index
     //! We separate element and neighbor scvs to speed up mapping
     const SubControlVolume& scv(GridIndexType scvIdx) const
     {
diff --git a/dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh b/dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh
index 5447e824b7..8ab3f7fdd1 100644
--- a/dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh
+++ b/dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh
@@ -272,7 +272,7 @@ private:
             scvfIndexSet.reserve(MpfaHelper::getNumLocalScvfs(elementGeometry.type()));
 
             // for network grids there might be multiple intersection with the same geometryInInside
-            // we indentify those by the indexInInside for now (assumes conforming grids at branching facets)
+            // we identify those by the indexInInside for now (assumes conforming grids at branching facets)
             std::vector<ScvfOutsideGridIndexStorage> outsideIndices;
             if (dim < dimWorld)
             {
@@ -660,7 +660,7 @@ private:
             neighborVolVarIndexSet.reserve(numLocalFaces);
 
             // for network grids there might be multiple intersections with the same geometryInInside
-            // we indentify those by the indexInInside for now (assumes conforming grids at branching facets)
+            // we identify those by the indexInInside for now (assumes conforming grids at branching facets)
             std::vector<ScvfOutsideGridIndexStorage> outsideIndices;
             if (dim < dimWorld)
             {
diff --git a/dumux/discretization/cellcentered/mpfa/helper.hh b/dumux/discretization/cellcentered/mpfa/helper.hh
index 1d772bc190..c646076acb 100644
--- a/dumux/discretization/cellcentered/mpfa/helper.hh
+++ b/dumux/discretization/cellcentered/mpfa/helper.hh
@@ -559,7 +559,7 @@ public:
 
         // mpfa methods have to have overlapping cells
         if (gridView.overlapSize(0) == 0)
-            DUNE_THROW(Dune::InvalidStateException, "Grid no overlaping cells. This is required by mpfa methods in parallel.");
+            DUNE_THROW(Dune::InvalidStateException, "Grid no overlapping cells. This is required by mpfa methods in parallel.");
 
         for (const auto& element : elements(gridView))
         {
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/localassembler.hh b/dumux/discretization/cellcentered/mpfa/omethod/localassembler.hh
index 59bc3ea932..5b0dc2ea74 100644
--- a/dumux/discretization/cellcentered/mpfa/omethod/localassembler.hh
+++ b/dumux/discretization/cellcentered/mpfa/omethod/localassembler.hh
@@ -20,7 +20,7 @@
  * \file
  * \ingroup CCMpfaDiscretization
  * \brief Class for the assembly of the local systems of equations
- *        involved in the transmissibility computaion in an mpfa-o type manner.
+ *        involved in the transmissibility computation in an mpfa-o type manner.
  */
 #ifndef DUMUX_DISCRETIZATION_CC_MPFA_O_LOCAL_ASSEMBLER_HH
 #define DUMUX_DISCRETIZATION_CC_MPFA_O_LOCAL_ASSEMBLER_HH
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/staticinteractionvolume.hh b/dumux/discretization/cellcentered/mpfa/omethod/staticinteractionvolume.hh
index 15a957be5d..639b36e3cb 100644
--- a/dumux/discretization/cellcentered/mpfa/omethod/staticinteractionvolume.hh
+++ b/dumux/discretization/cellcentered/mpfa/omethod/staticinteractionvolume.hh
@@ -148,7 +148,7 @@ public:
     struct DirichletData
     {
         GridIndexType volVarIndex() const
-        { DUNE_THROW(Dune::InvalidStateException, "Static interaction volume cannot be used on bounaries!"); }
+        { DUNE_THROW(Dune::InvalidStateException, "Static interaction volume cannot be used on boundaries!"); }
     };
 
     //! publicly state the mpfa-scheme this interaction volume is associated with
diff --git a/dumux/discretization/cellcentered/mpfa/scvgradients.hh b/dumux/discretization/cellcentered/mpfa/scvgradients.hh
index e86cd0306d..e8e003b957 100644
--- a/dumux/discretization/cellcentered/mpfa/scvgradients.hh
+++ b/dumux/discretization/cellcentered/mpfa/scvgradients.hh
@@ -19,7 +19,7 @@
 /*!
  * \file
  * \ingroup CCMpfaDiscretization
- * \brief Class roviding functionality for the reconstruction of the
+ * \brief Class providing functionality for the reconstruction of the
  *        gradients in the sub-control volumes involved in mpfa schemes.
  */
 #ifndef DUMUX_CC_MPFA_SCV_GRADIENTS_HH
@@ -38,7 +38,7 @@ namespace Dumux {
 
 /*!
  * \ingroup CCMpfaDiscretization
- * \brief Class roviding functionality for the reconstruction of the
+ * \brief Class providing functionality for the reconstruction of the
  *        gradients in the sub-control volumes involved in mpfa schemes.
  */
 class CCMpfaScvGradients
@@ -178,7 +178,7 @@ private:
                 if (!vertexHandled[gridGeometry.vertexMapper().subIndex(element, i, dim)])
                     allFinished = false;
 
-            // bind views only if there is unfinished buisness
+            // bind views only if there is unfinished business
             if (allFinished)
                 continue;
 
diff --git a/dumux/discretization/cellcentered/subcontrolvolume.hh b/dumux/discretization/cellcentered/subcontrolvolume.hh
index 5f93087ba4..5efbbf7666 100644
--- a/dumux/discretization/cellcentered/subcontrolvolume.hh
+++ b/dumux/discretization/cellcentered/subcontrolvolume.hh
@@ -97,11 +97,11 @@ public:
     , elementIndex_(elementIndex)
     {}
 
-    //! The copy constrcutor
+    //! The copy constructor
     CCSubControlVolume(const CCSubControlVolume& other)
     { deepCopy_(other); }
 
-    //! The move constrcutor
+    //! The move constructor
     CCSubControlVolume(CCSubControlVolume&& other) = default;
 
     //! The copy assignment operator
diff --git a/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh b/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh
index 88a14f8d0b..40656d7a54 100644
--- a/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh
+++ b/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh
@@ -36,7 +36,7 @@ namespace Dumux {
 /*!
  * \ingroup CCTpfaDiscretization
  * \brief The local (stencil) volume variables class for cell centered tpfa models
- * \note The class is specilized for versions with and without caching
+ * \note The class is specialized for versions with and without caching
  * \tparam GVV the grid volume variables type
  * \tparam cachingEnabled if the cache is enabled
  */
diff --git a/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh b/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh
index b6c0976131..6129f321aa 100644
--- a/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh
+++ b/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh
@@ -83,7 +83,7 @@ public:
     CCTpfaFVElementGeometry(const GridGeometry& gridGeometry)
     : gridGeometryPtr_(&gridGeometry) {}
 
-    //! Get an elment sub control volume with a global scv index
+    //! Get an element sub control volume with a global scv index
     //! We separate element and neighbor scvs to speed up mapping
     const SubControlVolume& scv(GridIndexType scvIdx) const
     {
@@ -235,7 +235,7 @@ public:
     CCTpfaFVElementGeometry(const GridGeometry& gridGeometry)
     : gridGeometryPtr_(&gridGeometry) {}
 
-    //! Get an elment sub control volume with a global scv index
+    //! Get an element sub control volume with a global scv index
     //! We separate element and neighbor scvs to speed up mapping
     const SubControlVolume& scv(GridIndexType scvIdx) const
     {
@@ -475,7 +475,7 @@ private:
         const auto& neighborVolVarIndices = gridGeometry().neighborVolVarIndices(eIdx);
 
         // for network grids there might be multiple intersection with the same geometryInInside
-        // we indentify those by the indexInInside for now (assumes conforming grids at branching facets)
+        // we identify those by the indexInInside for now (assumes conforming grids at branching facets)
         // here we keep track of them
         std::vector<bool> handledScvf;
         if (dim < dimWorld)
@@ -527,7 +527,7 @@ private:
         const auto& neighborVolVarIndices = gridGeometry().neighborVolVarIndices(eIdx);
 
         // for network grids there might be multiple intersection with the same geometryInInside
-        // we indentify those by the indexInInside for now (assumes conforming grids at branching facets)
+        // we identify those by the indexInInside for now (assumes conforming grids at branching facets)
         // here we keep track of them
         std::vector<bool> handledScvf;
         if (dim < dimWorld)
diff --git a/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh b/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh
index 8e0c10505f..667380f87b 100644
--- a/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh
+++ b/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh
@@ -246,7 +246,7 @@ private:
             scvfsIndexSet.reserve(element.subEntities(1));
 
             // for network grids there might be multiple intersection with the same geometryInInside
-            // we indentify those by the indexInInside for now (assumes conforming grids at branching facets)
+            // we identify those by the indexInInside for now (assumes conforming grids at branching facets)
             using ScvfGridIndexStorage = typename SubControlVolumeFace::Traits::GridIndexStorage;
             std::vector<ScvfGridIndexStorage> outsideIndices;
             if (dim < dimWorld)
diff --git a/dumux/discretization/facecentered/staggered/localintersectionindexmapper.hh b/dumux/discretization/facecentered/staggered/localintersectionindexmapper.hh
index b9e97602bb..0a2c92e84b 100644
--- a/dumux/discretization/facecentered/staggered/localintersectionindexmapper.hh
+++ b/dumux/discretization/facecentered/staggered/localintersectionindexmapper.hh
@@ -42,7 +42,7 @@ class FaceCenteredStaggeredLocalIntersectionIndexMapper;
 
 /*!
  * \ingroup FaceCenteredStaggeredDiscretization
- * \brief Provides a mapping of local intersecton indices (indexInInside)
+ * \brief Provides a mapping of local intersection indices (indexInInside)
  *        such that the local indices always follow the order of a reference element,
  *        regardless of how the element is oriented.
  */
@@ -90,7 +90,7 @@ private:
 
 /*!
  * \ingroup FaceCenteredStaggeredDiscretization
- * \brief Provides a mapping of local intersecton indices (indexInInside)
+ * \brief Provides a mapping of local intersection indices (indexInInside)
  *        such that the local indices always follow the order of a reference element,
  *        regardless of how the element in oriented.
  * \note This specialization is used for grids not supporting rotated elements.
@@ -119,7 +119,7 @@ public:
 
 /*!
  * \ingroup FaceCenteredStaggeredDiscretization
- * \brief Provides a mapping of local intersecton indices (indexInInside)
+ * \brief Provides a mapping of local intersection indices (indexInInside)
  *        such that the local indices always follow the order of a reference element,
  *        regardless of how the element is oriented. Does not do anything for grids
  *        not supporting rotated elements (such as Dune::YaspGrid).
diff --git a/dumux/discretization/porenetwork/fvelementgeometry.hh b/dumux/discretization/porenetwork/fvelementgeometry.hh
index 1d0ea02d17..8e321517b1 100644
--- a/dumux/discretization/porenetwork/fvelementgeometry.hh
+++ b/dumux/discretization/porenetwork/fvelementgeometry.hh
@@ -329,13 +329,13 @@ private:
         // construct the sub control volumes
         for (LocalIndexType scvLocalIdx = 0; scvLocalIdx < elementGeometry.corners(); ++scvLocalIdx)
         {
-            // get asssociated dof index
+            // get associated dof index
             const auto dofIdxGlobal = gridGeometry().vertexMapper().subIndex(element, scvLocalIdx, dim);
 
             // get the corners
             auto corners = std::array{elementGeometry.corner(scvLocalIdx), elementGeometry.center()};
 
-            // get the fractional volume asssociated with the scv
+            // get the fractional volume associated with the scv
             const auto volume = gridGeometry().poreVolume(dofIdxGlobal) / gridGeometry().coordinationNumber(dofIdxGlobal);
 
             // add scv to the local container
diff --git a/dumux/discretization/porenetwork/gridgeometry.hh b/dumux/discretization/porenetwork/gridgeometry.hh
index f9aeff6ecc..43f09f7cd8 100644
--- a/dumux/discretization/porenetwork/gridgeometry.hh
+++ b/dumux/discretization/porenetwork/gridgeometry.hh
@@ -643,7 +643,7 @@ private:
                 // get the corners
                 auto corners = std::array{elementGeometry.corner(scvLocalIdx), elementGeometry.center()};
 
-                // get the fractional volume asssociated with the scv
+                // get the fractional volume associated with the scv
                 const auto volume = this->poreVolume(dofIdxGlobal) / this->coordinationNumber(dofIdxGlobal);
 
                 scvs_[eIdx][scvLocalIdx] = SubControlVolume(dofIdxGlobal,
@@ -682,7 +682,7 @@ private:
     std::size_t numScv_;
     std::size_t numScvf_;
 
-    // vertices on the boudary
+    // vertices on the boundary
     std::vector<bool> boundaryDofIndices_;
     std::vector<bool> hasBoundaryScvf_;
 };
@@ -834,7 +834,7 @@ private:
     std::size_t numScv_;
     std::size_t numScvf_;
 
-    // vertices on the boudary
+    // vertices on the boundary
     std::vector<bool> boundaryDofIndices_;
 };
 
diff --git a/dumux/discretization/porenetwork/subcontrolvolume.hh b/dumux/discretization/porenetwork/subcontrolvolume.hh
index e5d1f5eb84..53e1c8b278 100644
--- a/dumux/discretization/porenetwork/subcontrolvolume.hh
+++ b/dumux/discretization/porenetwork/subcontrolvolume.hh
@@ -80,7 +80,7 @@ public:
     //! The default constructor
     PNMSubControlVolume() = default;
 
-    // the contructor in the box case
+    // the constructor in the box case
     template<class Corners>
     PNMSubControlVolume(GridIndexType dofIndex,
                         LocalIndexType scvIdx,
diff --git a/dumux/discretization/staggered/freeflow/properties.hh b/dumux/discretization/staggered/freeflow/properties.hh
index 2287216ee0..4bccd82947 100644
--- a/dumux/discretization/staggered/freeflow/properties.hh
+++ b/dumux/discretization/staggered/freeflow/properties.hh
@@ -61,7 +61,7 @@ struct NumEqFace<TypeTag, TTag::StaggeredFreeFlowModel> { static constexpr int v
 /*!
  * \brief  For free flow models, we take the number of "physical" equations
  *         (e.g. 4 for a 3D NavierStokes problem, 3 velocity components and pressure)
- *         and substract the number of dimensions. This yields the number of equations to be
+ *         and subtract the number of dimensions. This yields the number of equations to be
  *         solved on the cell centers. Works also for non-isothermal models.
  */
 template<class TypeTag>
diff --git a/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh b/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh
index 6a7d6a76af..6d489cfdb1 100644
--- a/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh
+++ b/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh
@@ -204,7 +204,7 @@ public:
         return area_;
     }
 
-    //! Returns bolean if the sub control volume face is on the boundary
+    //! Returns boolean if the sub control volume face is on the boundary
     bool boundary() const
     {
         return boundary_;
@@ -442,7 +442,7 @@ public:
             // pairData(localSubFaceIdx).parallelCellWidths[0]) will return 0.0 if the subface perpendicular the scvf lies on a boundary
         else
         {
-            assert((parallelDegreeIdx == 1) && "Only the width of the first two parallel cells (indicies 0 and 1) is stored for each scvf.");
+            assert((parallelDegreeIdx == 1) && "Only the width of the first two parallel cells (indices 0 and 1) is stored for each scvf.");
             return (pairData(localSubFaceIdx).parallelCellWidths[0] + pairData(localSubFaceIdx).parallelCellWidths[1]) * 0.5;
         }
     }
diff --git a/dumux/discretization/staggered/fvelementgeometry.hh b/dumux/discretization/staggered/fvelementgeometry.hh
index 4fbfa0a4b0..6581a68b9c 100644
--- a/dumux/discretization/staggered/fvelementgeometry.hh
+++ b/dumux/discretization/staggered/fvelementgeometry.hh
@@ -120,7 +120,7 @@ public:
         return scvf(this->gridGeometry().localToGlobalScvfIndex(eIdx, localScvfIdx));
     }
 
-    //! Get an elment sub control volume with a global scv index
+    //! Get an element sub control volume with a global scv index
     //! We separate element and neighbor scvs to speed up mapping
     const SubControlVolume& scv(GridIndexType scvIdx) const
     {
diff --git a/dumux/discretization/staggered/fvgridgeometry.hh b/dumux/discretization/staggered/fvgridgeometry.hh
index c3e844ee79..b7fbee2894 100644
--- a/dumux/discretization/staggered/fvgridgeometry.hh
+++ b/dumux/discretization/staggered/fvgridgeometry.hh
@@ -701,7 +701,7 @@ private:
             neighborVolVarIndices_[eIdx] = neighborVolVarIndexSet;
         }
 
-        // build the connectivity map for an effecient assembly
+        // build the connectivity map for an efficient assembly
         connectivityMap_.update(*this);
     }
 
diff --git a/dumux/discretization/staggered/subcontrolvolumeface.hh b/dumux/discretization/staggered/subcontrolvolumeface.hh
index 150e35f687..2db096a1c2 100644
--- a/dumux/discretization/staggered/subcontrolvolumeface.hh
+++ b/dumux/discretization/staggered/subcontrolvolumeface.hh
@@ -182,7 +182,7 @@ public:
         return area_;
     }
 
-    //! Returns bolean if the sub control volume face is on the boundary
+    //! Returns boolean if the sub control volume face is on the boundary
     bool boundary() const
     {
         return boundary_;
diff --git a/dumux/discretization/subcontrolvolumefacebase.hh b/dumux/discretization/subcontrolvolumefacebase.hh
index bea3bcebc6..3cfcb40bf1 100644
--- a/dumux/discretization/subcontrolvolumefacebase.hh
+++ b/dumux/discretization/subcontrolvolumefacebase.hh
@@ -68,7 +68,7 @@ public:
         return asImp_().area();
     }
 
-    //! returns bolean if the sub control volume face is on the boundary
+    //! returns boolean if the sub control volume face is on the boundary
     bool boundary() const
     {
         return asImp_().boundary();
diff --git a/dumux/flux/box/fourierslaw.hh b/dumux/flux/box/fourierslaw.hh
index 0a55689112..e91d6503a3 100644
--- a/dumux/flux/box/fourierslaw.hh
+++ b/dumux/flux/box/fourierslaw.hh
@@ -95,7 +95,7 @@ public:
         for (auto&& scv : scvs(fvGeometry))
             gradTemp.axpy(elemVolVars[scv].temperature(), fluxVarsCache.gradN(scv.indexInElement()));
 
-        // comute the heat conduction flux
+        // compute the heat conduction flux
         return -1.0*vtmv(scvf.unitOuterNormal(), lambda, gradTemp)*Extrusion::area(scvf);
     }
 };
diff --git a/dumux/flux/box/fourierslawnonequilibrium.hh b/dumux/flux/box/fourierslawnonequilibrium.hh
index c6b33d9597..1c5024088b 100644
--- a/dumux/flux/box/fourierslawnonequilibrium.hh
+++ b/dumux/flux/box/fourierslawnonequilibrium.hh
@@ -118,7 +118,7 @@ public:
                gradTemp.axpy(elemVolVars[scv].temperatureSolid(), fluxVarsCache.gradN(scv.indexInElement()));
         }
 
-        // comute the heat conduction flux
+        // compute the heat conduction flux
         return -1.0*vtmv(scvf.unitOuterNormal(), lambda, gradTemp)*Extrusion::area(scvf);
     }
 };
diff --git a/dumux/flux/box/maxwellstefanslaw.hh b/dumux/flux/box/maxwellstefanslaw.hh
index 758e80e18c..4e21b7eb17 100644
--- a/dumux/flux/box/maxwellstefanslaw.hh
+++ b/dumux/flux/box/maxwellstefanslaw.hh
@@ -164,7 +164,7 @@ private:
         const auto& insideVolVars = elemVolVars[scvf.insideScvIdx()];
         const auto& outsideVolVars = elemVolVars[scvf.outsideScvIdx()];
 
-        //this is to not devide by 0 if the saturation in 0 and the effectiveDiffusionCoefficient becomes zero due to that
+        //this is to not divide by 0 if the saturation in 0 and the effectiveDiffusionCoefficient becomes zero due to that
         if(Dune::FloatCmp::eq<Scalar>(insideVolVars.saturation(phaseIdx), 0) || Dune::FloatCmp::eq<Scalar>(outsideVolVars.saturation(phaseIdx), 0))
             return reducedDiffusionMatrix;
 
@@ -184,7 +184,7 @@ private:
             // the resulting averaged diffusion tensor
             const auto tin = faceTensorAverage(tinInside, tinOutside, scvf.unitOuterNormal());
 
-            //begin the entrys of the diffusion matrix of the diagonal
+            // begin with the entries of the diffusion matrix of the diagonal
             reducedDiffusionMatrix[compIIdx][compIIdx] += xi*avgMolarMass/(tin*Mn);
 
             // now set the rest of the entries (off-diagonal and additional entries for diagonal)
diff --git a/dumux/flux/ccmpfa/darcyslaw.hh b/dumux/flux/ccmpfa/darcyslaw.hh
index 9627f8e7ac..19f5af8b2a 100644
--- a/dumux/flux/ccmpfa/darcyslaw.hh
+++ b/dumux/flux/ccmpfa/darcyslaw.hh
@@ -74,7 +74,7 @@ class DarcysLawImplementation<TypeTag, DiscretizationMethods::CCMpfa>
                          const SubControlVolumeFace& scvf,
                          const FluxVariablesCacheFiller& fluxVarsCacheFiller)
         {
-            // get interaction volume related data from the filler class & upate the cache
+            // get interaction volume related data from the filler class & update the cache
             if (fvGeometry.gridGeometry().vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
                 scvfFluxVarsCache.updateAdvection(fluxVarsCacheFiller.secondaryInteractionVolume(),
                                                   fluxVarsCacheFiller.secondaryIvLocalFaceData(),
diff --git a/dumux/flux/ccmpfa/fickslaw.hh b/dumux/flux/ccmpfa/fickslaw.hh
index 4681a060dc..35cec02db4 100644
--- a/dumux/flux/ccmpfa/fickslaw.hh
+++ b/dumux/flux/ccmpfa/fickslaw.hh
@@ -33,7 +33,7 @@
 
 namespace Dumux {
 
-//! forward declaration of the method-specific implemetation
+//! forward declaration of the method-specific implementation
 template<class TypeTag, class DiscretizationMethod, ReferenceSystemFormulation referenceSystem>
 class FicksLawImplementation;
 
@@ -82,7 +82,7 @@ class FicksLawImplementation<TypeTag, DiscretizationMethods::CCMpfa, referenceSy
                          const SubControlVolumeFace& scvf,
                          const FluxVariablesCacheFiller& fluxVarsCacheFiller)
         {
-            // get interaction volume related data from the filler class & upate the cache
+            // get interaction volume related data from the filler class & update the cache
             if (fvGeometry.gridGeometry().vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
                 scvfFluxVarsCache.updateDiffusion(fluxVarsCacheFiller.secondaryInteractionVolume(),
                                                   fluxVarsCacheFiller.secondaryIvLocalFaceData(),
diff --git a/dumux/flux/ccmpfa/fourierslaw.hh b/dumux/flux/ccmpfa/fourierslaw.hh
index af476d6be8..36faec432d 100644
--- a/dumux/flux/ccmpfa/fourierslaw.hh
+++ b/dumux/flux/ccmpfa/fourierslaw.hh
@@ -74,7 +74,7 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethods::CCMpfa>
                          const SubControlVolumeFace& scvf,
                          const FluxVariablesCacheFiller& fluxVarsCacheFiller)
         {
-          // get interaction volume from the flux vars cache filler & upate the cache
+          // get interaction volume from the flux vars cache filler & update the cache
           if (fvGeometry.gridGeometry().vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
               scvfFluxVarsCache.updateHeatConduction(fluxVarsCacheFiller.secondaryInteractionVolume(),
                                                      fluxVarsCacheFiller.secondaryIvLocalFaceData(),
diff --git a/dumux/flux/cctpfa/maxwellstefanslaw.hh b/dumux/flux/cctpfa/maxwellstefanslaw.hh
index b567b05722..c45578cb0c 100644
--- a/dumux/flux/cctpfa/maxwellstefanslaw.hh
+++ b/dumux/flux/cctpfa/maxwellstefanslaw.hh
@@ -229,7 +229,7 @@ private:
     {
         ReducedComponentMatrix reducedDiffusionMatrix(0.0);
 
-        //this is to not devide by 0 if the saturation in 0 and the effectiveDiffusionCoefficient becomes zero due to that
+        //this is to not divide by 0 if the saturation in 0 and the effectiveDiffusionCoefficient becomes zero due to that
         if(Dune::FloatCmp::eq<Scalar>(volVars.saturation(phaseIdx), 0))
             return reducedDiffusionMatrix;
 
diff --git a/dumux/flux/fickiandiffusioncoefficients.hh b/dumux/flux/fickiandiffusioncoefficients.hh
index c81389b986..dd0fde0de1 100644
--- a/dumux/flux/fickiandiffusioncoefficients.hh
+++ b/dumux/flux/fickiandiffusioncoefficients.hh
@@ -47,7 +47,7 @@ public:
     void update(const DiffCoeffFunc& computeDiffCoeff)
     {
         // fill the diffusion coefficient, only compute the ones we need, see getIndex_ doc
-        // the first component index "compIIdx" is always the main compnent index (phaseIdx)
+        // the first component index "compIIdx" is always the main component index (phaseIdx)
         // if we have less components than phases we need to limit the index
         // this last case only occurs for 3p2c, there are no other special cases (2p1c doesn't have diffusion, max. number of phases is 3)
         static_assert(numPhases <= numComponents || (numPhases == 3 && numComponents == 2),
diff --git a/dumux/flux/fickslaw.hh b/dumux/flux/fickslaw.hh
index 8daf6d95a7..1049f3aecf 100644
--- a/dumux/flux/fickslaw.hh
+++ b/dumux/flux/fickslaw.hh
@@ -19,7 +19,7 @@
 /*!
  * \file
  * \ingroup Flux
- * \brief Fick's law specilized for different discretization schemes.
+ * \brief Fick's law specialized for different discretization schemes.
  *        This file contains the data which is required to calculate
  *        diffusive mass fluxes due to molecular diffusion with Fick's law.
  */
diff --git a/dumux/flux/fickslaw_fwd.hh b/dumux/flux/fickslaw_fwd.hh
index 8264f2c6c5..c3f9c0cf88 100644
--- a/dumux/flux/fickslaw_fwd.hh
+++ b/dumux/flux/fickslaw_fwd.hh
@@ -19,7 +19,7 @@
 /*!
  * \file
  * \ingroup Flux
- * \brief Fick's law specilized for different discretization schemes.
+ * \brief Fick's law specialized for different discretization schemes.
  *        This file contains the data which is required to calculate
  *        diffusive mass fluxes due to molecular diffusion with Fick's law.
  */
diff --git a/dumux/flux/shallowwaterviscousflux.hh b/dumux/flux/shallowwaterviscousflux.hh
index c1f8d8ec21..b47aa550f1 100644
--- a/dumux/flux/shallowwaterviscousflux.hh
+++ b/dumux/flux/shallowwaterviscousflux.hh
@@ -144,7 +144,7 @@ public:
             else
             {
                 // turbulence model based on mixing length
-                // Compute the turbulent viscosity using a combined horizonal/vertical mixing length approach
+                // Compute the turbulent viscosity using a combined horizontal/vertical mixing length approach
                 // Turbulence coefficients: vertical (Elder like) and horizontal (Smagorinsky like)
                 static const auto turbConstV = getParamFromGroup<Scalar>(problem.paramGroup(), "ShallowWater.VerticalCoefficientOfMixingLengthModel", 1.0);
                 static const auto turbConstH = getParamFromGroup<Scalar>(problem.paramGroup(), "ShallowWater.HorizontalCoefficientOfMixingLengthModel", 0.1);
diff --git a/dumux/freeflow/compositional/kepsilonncmodel.hh b/dumux/freeflow/compositional/kepsilonncmodel.hh
index e718f40eea..fbf91bde8b 100644
--- a/dumux/freeflow/compositional/kepsilonncmodel.hh
+++ b/dumux/freeflow/compositional/kepsilonncmodel.hh
@@ -22,7 +22,7 @@
  *
  * \brief A single-phase, multi-component k-epsilon model
  *
- * For a detailed model decription see dumux/freeflow/compositional/navierstokesncmodel.hh
+ * For a detailed model description see dumux/freeflow/compositional/navierstokesncmodel.hh
  */
 
 #ifndef DUMUX_KEPSILON_NC_MODEL_HH
diff --git a/dumux/freeflow/compositional/komegancmodel.hh b/dumux/freeflow/compositional/komegancmodel.hh
index 1c63e37ea1..a85093e1db 100644
--- a/dumux/freeflow/compositional/komegancmodel.hh
+++ b/dumux/freeflow/compositional/komegancmodel.hh
@@ -22,7 +22,7 @@
  *
  * \brief A single-phase, multi-component k-omega model
  *
- * For a detailed model decription see dumux/freeflow/compositional/navierstokesncmodel.hh
+ * For a detailed model description see dumux/freeflow/compositional/navierstokesncmodel.hh
  */
 
 #ifndef DUMUX_KOMEGA_NC_MODEL_HH
diff --git a/dumux/freeflow/compositional/lowrekepsilonncmodel.hh b/dumux/freeflow/compositional/lowrekepsilonncmodel.hh
index 4997e145b2..efe200bc20 100644
--- a/dumux/freeflow/compositional/lowrekepsilonncmodel.hh
+++ b/dumux/freeflow/compositional/lowrekepsilonncmodel.hh
@@ -22,7 +22,7 @@
  *
  * \brief A single-phase, multi-component low-Re k-epsilon model
  *
- * For a detailed model decription see dumux/freeflow/compositional/navierstokesncmodel.hh
+ * For a detailed model description see dumux/freeflow/compositional/navierstokesncmodel.hh
  */
 
 #ifndef DUMUX_LOWREKEPSILON_NC_MODEL_HH
diff --git a/dumux/freeflow/compositional/oneeqncmodel.hh b/dumux/freeflow/compositional/oneeqncmodel.hh
index ef4c6cd5cc..cc50be2183 100644
--- a/dumux/freeflow/compositional/oneeqncmodel.hh
+++ b/dumux/freeflow/compositional/oneeqncmodel.hh
@@ -22,7 +22,7 @@
  *
  * \brief A single-phase, multi-component one-equation model
  *
- * For a detailed model decription see dumux/freeflow/compositional/navierstokesncmodel.hh
+ * For a detailed model description see dumux/freeflow/compositional/navierstokesncmodel.hh
  */
 
 #ifndef DUMUX_ONEEQ_NC_MODEL_HH
diff --git a/dumux/freeflow/compositional/sstncmodel.hh b/dumux/freeflow/compositional/sstncmodel.hh
index 91f2275d31..c57a128281 100644
--- a/dumux/freeflow/compositional/sstncmodel.hh
+++ b/dumux/freeflow/compositional/sstncmodel.hh
@@ -22,7 +22,7 @@
  *
  * \brief A single-phase, multi-component SST model
  *
- * For a detailed model decription see dumux/freeflow/compositional/navierstokesncmodel.hh
+ * For a detailed model description see dumux/freeflow/compositional/navierstokesncmodel.hh
  */
 
 #ifndef DUMUX_SST_NC_MODEL_HH
diff --git a/dumux/freeflow/compositional/zeroeqncmodel.hh b/dumux/freeflow/compositional/zeroeqncmodel.hh
index 5a69774bb0..935c0ab1f1 100644
--- a/dumux/freeflow/compositional/zeroeqncmodel.hh
+++ b/dumux/freeflow/compositional/zeroeqncmodel.hh
@@ -23,7 +23,7 @@
  *
  * \brief A single-phase, multi-component Reynolds-Averaged Navier-Stokes 0-Eq. model
  *
- * For a detailed model decription see dumux/freeflow/compositional/navierstokesncmodel.hh
+ * For a detailed model description see dumux/freeflow/compositional/navierstokesncmodel.hh
  */
 
 #ifndef DUMUX_ZEROEQ_NC_MODEL_HH
diff --git a/dumux/freeflow/navierstokes/momentum/fluxvariables.hh b/dumux/freeflow/navierstokes/momentum/fluxvariables.hh
index 6c50f51f2b..4d350f9e3e 100644
--- a/dumux/freeflow/navierstokes/momentum/fluxvariables.hh
+++ b/dumux/freeflow/navierstokes/momentum/fluxvariables.hh
@@ -295,7 +295,7 @@ public:
         // The pressure contribution calculated above might have a much larger numerical value compared to the viscous or inertial forces.
         // This may lead to numerical inaccuracies due to loss of significance (cancellantion) for the final residual value.
         // In the end, we are only interested in a pressure difference between the two relevant faces so we can
-        // substract a reference value from the actual pressure contribution. Assuming an axisparallel cartesian grid,
+        // subtract a reference value from the actual pressure contribution. Assuming an axisparallel cartesian grid,
         // scvf.area() will have the same value at both opposing faces such that the reference pressure contribution
         // cancels out in the final residual which combines the pressure contribution of two adjacent elements
         // We explicitly do extrude the area here because that might yield different results in both elements.
diff --git a/dumux/freeflow/navierstokes/momentum/localresidual.hh b/dumux/freeflow/navierstokes/momentum/localresidual.hh
index bc1264e058..43924b431f 100644
--- a/dumux/freeflow/navierstokes/momentum/localresidual.hh
+++ b/dumux/freeflow/navierstokes/momentum/localresidual.hh
@@ -279,7 +279,7 @@ public:
         }
         else if (scvf.boundary())
         {
-            // Here, the lateral face does lie on a boundary. Retrive the Neumann flux component for
+            // Here, the lateral face does lie on a boundary. Retrieve the Neumann flux component for
             // the corresponding scvs' DOF orientation.
             //
             //
diff --git a/dumux/freeflow/navierstokes/problem.hh b/dumux/freeflow/navierstokes/problem.hh
index acf3e9b7c6..c5d0346262 100644
--- a/dumux/freeflow/navierstokes/problem.hh
+++ b/dumux/freeflow/navierstokes/problem.hh
@@ -244,7 +244,7 @@ public:
     { return gravity_; }
 
     /*!
-     * \brief Returns whether intertia terms should be considered.
+     * \brief Returns whether inertia terms should be considered.
      */
     bool enableInertiaTerms() const
     { return enableInertiaTerms_; }
@@ -273,7 +273,7 @@ public:
 
     /*!
      * \brief Returns a reference pressure at a given sub control volume face.
-     *        This pressure is substracted from the actual pressure for the momentum balance
+     *        This pressure is subtracted from the actual pressure for the momentum balance
      *        which potentially helps to improve numerical accuracy by avoiding issues related do floating point arithmetic.
      * \note  Overload this for reference pressures other than zero.
      */
@@ -1109,7 +1109,7 @@ public:
     bool enableInertiaTerms() const
     { return enableInertiaTerms_; }
 
-    //! Applys the initial face solution (velocities on the faces). Specialization for staggered grid discretization.
+    //! Applies the initial face solution (velocities on the faces). Specialization for staggered grid discretization.
     template <class SolutionVector, class G = GridGeometry>
     typename std::enable_if<G::discMethod == DiscretizationMethods::staggered, void>::type
     applyInitialFaceSolution(SolutionVector& sol,
diff --git a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
index ee37bcae1e..2ab1a75a9d 100644
--- a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
+++ b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
@@ -297,7 +297,7 @@ public:
         for (int localSubFaceIdx = 0; localSubFaceIdx < numSubFaces; ++localSubFaceIdx)
         {
             const auto eIdx = scvf.insideScvIdx();
-            // Get the face normal to the face the dof lives on. The staggered sub face conincides with half of this lateral face.
+            // Get the face normal to the face the dof lives on. The staggered sub face coincides with half of this lateral face.
             const auto& lateralFace = fvGeometry.scvf(eIdx, scvf.pairData(localSubFaceIdx).localLateralFaceIdx);
 
             // Create a boundaryTypes object (will be empty if not at a boundary).
@@ -321,7 +321,7 @@ public:
                 lateralFaceBoundaryTypes.emplace(problem.boundaryTypes(element, lateralFace));
             }
 
-            // If the current scvf is on a bounary and if there is a Neumann or Beavers-Joseph-(Saffmann) BC for the stress in tangential direction,
+            // If the current scvf is on a boundary and if there is a Neumann or Beavers-Joseph-(Saffmann) BC for the stress in tangential direction,
             // assign this value for the lateral momentum flux. No further calculations are required. We assume that all lateral faces
             // have the same type of BC (Neumann or Beavers-Joseph-(Saffmann)), but we sample the value at their actual positions.
             if (currentScvfBoundaryTypes)
@@ -616,7 +616,7 @@ private:
 
     /*!
      * \brief Get the location of the lateral staggered face's center.
-     *        Only needed for boundary conditions if the current scvf or the lateral one is on a bounary.
+     *        Only needed for boundary conditions if the current scvf or the lateral one is on a boundary.
      *
      * \verbatim
      *      --------#######o                 || frontal face of staggered half-control-volume
@@ -635,7 +635,7 @@ private:
 
     /*!
      * \brief Get the location of the lateral staggered sub control volume face center.
-     *        Only needed for boundary conditions if the current scvf or the lateral one is on a bounary.
+     *        Only needed for boundary conditions if the current scvf or the lateral one is on a boundary.
      *
      * \verbatim
      *      --------###o####                 || frontal face of staggered half-control-volume
diff --git a/dumux/freeflow/navierstokes/staggered/localresidual.hh b/dumux/freeflow/navierstokes/staggered/localresidual.hh
index f76c8072d3..55d905da70 100644
--- a/dumux/freeflow/navierstokes/staggered/localresidual.hh
+++ b/dumux/freeflow/navierstokes/staggered/localresidual.hh
@@ -290,7 +290,7 @@ public:
             }
             else if(bcTypes.isSymmetry())
             {
-                // for symmetry boundary conditions, there is no flow accross the boundary and
+                // for symmetry boundary conditions, there is no flow across the boundary and
                 // we therefore treat it like a Dirichlet boundary conditions with zero velocity
                 const Scalar velocity = elemFaceVars[scvf].velocitySelf();
                 const Scalar fixedValue = 0.0;
diff --git a/dumux/freeflow/navierstokes/staggered/staggeredupwindhelper.hh b/dumux/freeflow/navierstokes/staggered/staggeredupwindhelper.hh
index 9d1a9996bd..f41e7b1268 100644
--- a/dumux/freeflow/navierstokes/staggered/staggeredupwindhelper.hh
+++ b/dumux/freeflow/navierstokes/staggered/staggeredupwindhelper.hh
@@ -105,7 +105,7 @@ public:
     {}
 
     /*!
-     * \brief Returns the momentum in the frontal directon.
+     * \brief Returns the momentum in the frontal direction.
      *
      *        Checks if the model has higher order methods enabled and if the scvf in
      *        question is far enough from the boundary such that higher order methods can be employed.
@@ -134,7 +134,7 @@ public:
     }
 
     /*!
-     * \brief Returns the momentum in the lateral directon.
+     * \brief Returns the momentum in the lateral direction.
      *
      *        Evaluates which face is upstream.
      *        Checks if the model has higher order methods enabled and if the scvf in
diff --git a/dumux/freeflow/navierstokes/staggered/velocitygradients.hh b/dumux/freeflow/navierstokes/staggered/velocitygradients.hh
index d3c2c3d340..9419962d77 100644
--- a/dumux/freeflow/navierstokes/staggered/velocitygradients.hh
+++ b/dumux/freeflow/navierstokes/staggered/velocitygradients.hh
@@ -366,7 +366,7 @@ private:
 
     /*!
      * \brief Get the location of the lateral staggered face's center.
-     *        Only needed for boundary conditions if the current scvf or the lateral one is on a bounary.
+     *        Only needed for boundary conditions if the current scvf or the lateral one is on a boundary.
      *
      * \verbatim
      *      --------#######o                 || frontal face of staggered half-control-volume
diff --git a/dumux/freeflow/rans/problem.hh b/dumux/freeflow/rans/problem.hh
index e5c0fa649b..702d7587e3 100644
--- a/dumux/freeflow/rans/problem.hh
+++ b/dumux/freeflow/rans/problem.hh
@@ -84,7 +84,7 @@ class RANSProblemBase : public NavierStokesProblem<TypeTag>
 
     struct WallElementInformation
     {
-        // store the element indicies for all elements with an intersection on the wall
+        // store the element indices for all elements with an intersection on the wall
         unsigned int wallElementIdx;
         // for each wall element, store the faces normal axis
         unsigned int wallFaceNormalAxis;
@@ -373,7 +373,7 @@ private:
         if (!(GridGeometry::discMethod == DiscretizationMethods::staggered))
             DUNE_THROW(Dune::NotImplemented, "The wall direction Index can only be calculated for quadrilateral structured grids");
 
-        // If isFlatWallBounded, the corresonding wall element is stored for each element
+        // If isFlatWallBounded, the corresponding wall element is stored for each element
         if (isFlatWallBounded())
         {
             wallNormalAxis_.resize(wallData.size());
@@ -398,7 +398,7 @@ private:
     }
 
     /*!
-     * \brief Store all direct neighbor indicies for each element
+     * \brief Store all direct neighbor indices for each element
      */
     void findNeighborIndices_()
     {
diff --git a/dumux/freeflow/rans/zeroeq/problem.hh b/dumux/freeflow/rans/zeroeq/problem.hh
index 03875b82d5..398b0ada6c 100644
--- a/dumux/freeflow/rans/zeroeq/problem.hh
+++ b/dumux/freeflow/rans/zeroeq/problem.hh
@@ -113,7 +113,7 @@ public:
         if (hasParam("Problem.SandGrainRoughness"))
             calculateRoughnessLength_(curSol);
 
-        // update routine for specfic models
+        // update routine for specific models
         if (eddyViscosityModel().compare("baldwinLomax") == 0)
             updateBaldwinLomaxProperties();
     }
diff --git a/dumux/geomechanics/elastic/localresidual.hh b/dumux/geomechanics/elastic/localresidual.hh
index c0f2e1bbfe..3a8acba743 100644
--- a/dumux/geomechanics/elastic/localresidual.hh
+++ b/dumux/geomechanics/elastic/localresidual.hh
@@ -85,7 +85,7 @@ public:
      * \param fvGeometry The finite-volume geometry
      * \param elemVolVars The volume variables of the current element
      * \param scvf The sub control volume face to compute the flux on
-     * \param elemFluxVarsCache The cache related to flux compuation
+     * \param elemFluxVarsCache The cache related to flux computation
      */
     NumEqVector computeFlux(const Problem& problem,
                             const Element& element,
diff --git a/dumux/geometry/boundingboxtree.hh b/dumux/geometry/boundingboxtree.hh
index 638e74de73..ea99ab4feb 100644
--- a/dumux/geometry/boundingboxtree.hh
+++ b/dumux/geometry/boundingboxtree.hh
@@ -127,7 +127,7 @@ public:
 
         // We are done, log output
         std::cout << "Computed bounding box tree with " << numBoundingBoxes()
-                  << " nodes for " << numLeaves << " grid entites in "
+                  << " nodes for " << numLeaves << " grid entities in "
                   << timer.stop() << " seconds." << std::endl;
     }
 
diff --git a/dumux/geometry/geometricentityset.hh b/dumux/geometry/geometricentityset.hh
index 267b523a2d..9a742eb93d 100644
--- a/dumux/geometry/geometricentityset.hh
+++ b/dumux/geometry/geometricentityset.hh
@@ -20,7 +20,7 @@
  * \file
  * \ingroup Geometry
  * \brief An interface for a set of geometric entities
- * \note This can be used e.g. to contruct a bounding box volume hierarchy of a grid
+ * \note This can be used e.g. to construct a bounding box volume hierarchy of a grid
  * It defines the minimum requirement for such a set
  */
 #ifndef DUMUX_GEOMETRY_GEOMETRIC_ENTITY_SET_HH
diff --git a/dumux/geometry/geometryintersection.hh b/dumux/geometry/geometryintersection.hh
index 6fdd29c1f3..56e0e2a19a 100644
--- a/dumux/geometry/geometryintersection.hh
+++ b/dumux/geometry/geometryintersection.hh
@@ -1356,7 +1356,7 @@ public:
         {
             const auto p0 = points[0];
             const auto normal = crossProduct(points[1] - p0, points[2] - p0);
-            // include the normal in eps (intead of norm*norm) since the normal can become very small
+            // include the normal in eps (instead of norm*norm) since the normal can become very small
             // if the first three points are very close together
             const auto epsCoplanar = normal.two_norm()*norm*eps_;
             for (int i = 3; i < points.size(); ++i)
diff --git a/dumux/geometry/intersectingentities.hh b/dumux/geometry/intersectingentities.hh
index c2ad56d973..4ee59f3cd9 100644
--- a/dumux/geometry/intersectingentities.hh
+++ b/dumux/geometry/intersectingentities.hh
@@ -19,7 +19,7 @@
 /*!
  * \file
  * \ingroup Geometry
- * \brief Algorithms that finds which geometric entites intersect
+ * \brief Algorithms that finds which geometric entities intersect
  */
 #ifndef DUMUX_GEOMETRY_INTERSECTING_ENTITIES_HH
 #define DUMUX_GEOMETRY_INTERSECTING_ENTITIES_HH
diff --git a/dumux/geometry/intersectionentityset.hh b/dumux/geometry/intersectionentityset.hh
index e9799710df..a55dcc1b83 100644
--- a/dumux/geometry/intersectionentityset.hh
+++ b/dumux/geometry/intersectionentityset.hh
@@ -48,7 +48,7 @@ namespace Dumux {
 
 /*!
  * \ingroup Geometry
- * \brief A class representing the intersection entites two geometric entity sets
+ * \brief A class representing the intersection entities two geometric entity sets
  */
 template<class DomainEntitySet, class TargetEntitySet>
 class IntersectionEntitySet
diff --git a/dumux/io/grid/griddata.hh b/dumux/io/grid/griddata.hh
index e871b29a8f..1159ffcf17 100644
--- a/dumux/io/grid/griddata.hh
+++ b/dumux/io/grid/griddata.hh
@@ -219,7 +219,7 @@ public:
 
     /*!
      * \brief Create a data handle for communication of the data in parallel simulations
-     * \note this data hande is the default
+     * \note this data handle is the default
      */
     template<bool ug = Detail::isUG<Grid>::value, typename std::enable_if_t<!ug, int> = 0>
     DataHandle createGmshDataHandle()
@@ -229,7 +229,7 @@ public:
 
     /*!
      * \brief Create a data handle for communication of the data in parallel simulations
-     * \note this data hande is the specialized for UGGrid since UGGrid can't communicate element data (yet)
+     * \note this data handle is the specialized for UGGrid since UGGrid can't communicate element data (yet)
      */
     template<bool ug = Detail::isUG<Grid>::value, typename std::enable_if_t<ug, int> = 0>
     DataHandle createGmshDataHandle()
diff --git a/dumux/io/grid/gridmanager.hh b/dumux/io/grid/gridmanager.hh
index df10158874..98db4394a9 100644
--- a/dumux/io/grid/gridmanager.hh
+++ b/dumux/io/grid/gridmanager.hh
@@ -19,7 +19,7 @@
 /*!
  * \file
  * \ingroup InputOutput
- * \brief Convience header that includes all grid manager specializations
+ * \brief Convenience header that includes all grid manager specializations
  *
  * \todo add Petrel grids with dune-cornerpoint
  */
diff --git a/dumux/io/grid/gridmanager_alu.hh b/dumux/io/grid/gridmanager_alu.hh
index 95db21e6d0..274837e55e 100644
--- a/dumux/io/grid/gridmanager_alu.hh
+++ b/dumux/io/grid/gridmanager_alu.hh
@@ -71,11 +71,11 @@ public:
     void init(const std::string& modelParamGroup = "", bool adaptiveRestart = false)
     {
         // restarting an adaptive grid using Dune's BackupRestoreFacility
-        // TODO: the part after first || is backward compatibilty with old sequential models remove once sequential adpative restart is replaced
+        // TODO: the part after first || is backward compatibility with old sequential models remove once sequential adpative restart is replaced
         if (adaptiveRestart || hasParam("Restart") || hasParam("TimeManager.Restart"))
         {
             auto restartTime = getParamFromGroup<double>(modelParamGroup, "TimeLoop.Restart", 0.0);
-            // TODO: backward compatibilty with old sequential models remove once sequential adpative restart is replaced
+            // TODO: backward compatibility with old sequential models remove once sequential adpative restart is replaced
             if (hasParam("Restart") || hasParam("TimeManager.Restart"))
             {
                 restartTime = getParamFromGroup<double>("TimeManager", "Restart");
diff --git a/dumux/io/grid/gridmanager_oned.hh b/dumux/io/grid/gridmanager_oned.hh
index 75cbdba920..8ff34bf8d9 100644
--- a/dumux/io/grid/gridmanager_oned.hh
+++ b/dumux/io/grid/gridmanager_oned.hh
@@ -120,7 +120,7 @@ private:
         else if (refType == "Copy")
             ParentType::grid().setRefinementType(Dune::OneDGrid::RefinementType::COPY);
         else
-            DUNE_THROW(Dune::IOError, "OneGrid only supports 'Local' or 'Copy' as refinment type. Not '"<< refType<<"'!");
+            DUNE_THROW(Dune::IOError, "OneGrid only supports 'Local' or 'Copy' as refinement type. Not '"<< refType<<"'!");
 
         // Check if should refine the grid
         ParentType::maybeRefineGrid(modelParamGroup);
diff --git a/dumux/io/grid/gridmanager_ug.hh b/dumux/io/grid/gridmanager_ug.hh
index d624f1499e..0ac7b59aee 100644
--- a/dumux/io/grid/gridmanager_ug.hh
+++ b/dumux/io/grid/gridmanager_ug.hh
@@ -157,7 +157,7 @@ private:
         else if (refType == "Copy")
             ParentType::grid().setRefinementType(Dune::UGGrid<dim>::RefinementType::COPY);
         else
-            DUNE_THROW(Dune::IOError, "UGGrid only supports 'Local' or 'Copy' as refinment type. Not '"<< refType<<"'!");
+            DUNE_THROW(Dune::IOError, "UGGrid only supports 'Local' or 'Copy' as refinement type. Not '"<< refType<<"'!");
 
         // Set closure type
         const auto closureType = getParamFromGroup<std::string>(modelParamGroup, "Grid.ClosureType", "Green");
diff --git a/dumux/io/grid/porenetwork/griddata.hh b/dumux/io/grid/porenetwork/griddata.hh
index f9a967f84f..5e194b363e 100644
--- a/dumux/io/grid/porenetwork/griddata.hh
+++ b/dumux/io/grid/porenetwork/griddata.hh
@@ -343,11 +343,11 @@ private:
             // make sure that the number of specified parameters matches with the dgf file
             if (const auto& someElement = *(elements(gridView_()).begin()); elementParameterNames_.size() != dgfGrid_.nofParameters(someElement))
                 DUNE_THROW(Dune::InvalidStateException, "Number of user-specified element parameters (" << elementParameterNames_.size()
-                            << ") does not match number of element paramters in dgf file (" << dgfGrid_.nofParameters(someElement) << ")");
+                            << ") does not match number of element parameters in dgf file (" << dgfGrid_.nofParameters(someElement) << ")");
 
             if (const auto& someVertex = *(vertices(gridView_()).begin()); vertexParameterNames_.size() != dgfGrid_.nofParameters(someVertex))
                 DUNE_THROW(Dune::InvalidStateException, "Number of user-specified vertex parameters (" << vertexParameterNames_.size()
-                            << ") does not match number of vertex paramters in dgf file (" << dgfGrid_.nofParameters(someVertex) << ")");
+                            << ") does not match number of vertex parameters in dgf file (" << dgfGrid_.nofParameters(someVertex) << ")");
         }
 
         for (int i = 0; i < vertexParameterNames_.size(); ++i)
@@ -367,7 +367,7 @@ private:
      * \brief Initializes and returns a container for vertex (codim dim) or element (codim 0) data
      *
      * \param grid The grid
-     * \param numParams The number of paramters
+     * \param numParams The number of parameters
      * \param codim The codimension
      */
     auto makeParamContainer_(const Grid& grid, int numParams, int codim) const
diff --git a/dumux/io/grid/porenetwork/gridmanager.hh b/dumux/io/grid/porenetwork/gridmanager.hh
index 2b0d1fe348..7bdce07283 100644
--- a/dumux/io/grid/porenetwork/gridmanager.hh
+++ b/dumux/io/grid/porenetwork/gridmanager.hh
@@ -190,7 +190,7 @@ public:
         // evaluate the coordination numbers to check if all pores are connected to at least one throat
         gridData_->getCoordinationNumbers();
 
-        // for dgf grid, copy the data to peristent containers
+        // for dgf grid, copy the data to persistent containers
         if (enableDgfGridPointer_)
             gridData_->copyDgfData();
 
diff --git a/dumux/io/grid/porenetwork/parametersforgeneratedgrid.hh b/dumux/io/grid/porenetwork/parametersforgeneratedgrid.hh
index b24b7c3894..ef8350e3d9 100644
--- a/dumux/io/grid/porenetwork/parametersforgeneratedgrid.hh
+++ b/dumux/io/grid/porenetwork/parametersforgeneratedgrid.hh
@@ -606,7 +606,7 @@ private:
         // adapt the parameter name if there are subregions
         const std::string prefix = subregionId < 0 ? "Grid." : "Grid.Subregion" + std::to_string(subregionId) + ".";
         const Scalar inputThroatLength = getParamFromGroup<Scalar>(paramGroup_, prefix + "ThroatLength", -1.0);
-        // decide whether to substract the pore radii from the throat length or not
+        // decide whether to subtract the pore radii from the throat length or not
         const bool subtractRadiiFromThroatLength = getParamFromGroup<bool>(paramGroup_, prefix + "SubtractPoreInscribedRadiiFromThroatLength", true);
 
         return [=](const Element& element)
diff --git a/dumux/io/grid/porenetwork/structuredlatticegridcreator.hh b/dumux/io/grid/porenetwork/structuredlatticegridcreator.hh
index a6e81a102b..f55d09bdc8 100644
--- a/dumux/io/grid/porenetwork/structuredlatticegridcreator.hh
+++ b/dumux/io/grid/porenetwork/structuredlatticegridcreator.hh
@@ -321,7 +321,7 @@ private:
             directions[11] = "12: (-1, 1, 1)\n";
             directions[12] = "13: (-1, -1, 1)\n";
         }
-        DUNE_THROW(ParameterException, "You must specifiy probabilities for all directions (" << numDirections_() << ") \n" << directions << "\nExample (3D):\n\n"
+        DUNE_THROW(ParameterException, "You must specify probabilities for all directions (" << numDirections_() << ") \n" << directions << "\nExample (3D):\n\n"
         << "DeletionProbability = 0.5 0.5 0 0 0 0 0 0 0 0 0 0 0 \n\n"
         << "deletes approximately 50% of all throats in x and y direction, while no deletion in any other direction takes place.\n" );
     }
diff --git a/dumux/io/grid/porenetwork/subgriddata.hh b/dumux/io/grid/porenetwork/subgriddata.hh
index f90eb9cd91..1c620a54f1 100644
--- a/dumux/io/grid/porenetwork/subgriddata.hh
+++ b/dumux/io/grid/porenetwork/subgriddata.hh
@@ -80,7 +80,7 @@ public:
      */
     template <class GridImp, class IntersectionImp>
     const Dune::DGFBoundaryParameter::type& parameters(const Dune::Intersection<GridImp, IntersectionImp>& intersection) const
-    { return hostGridData_->paramters(intersection); }
+    { return hostGridData_->parameters(intersection); }
 
     /*!
      * \brief Computes and returns the label of a given throat
diff --git a/dumux/io/pointcloudvtkwriter.hh b/dumux/io/pointcloudvtkwriter.hh
index a51617a938..2ca03655a9 100644
--- a/dumux/io/pointcloudvtkwriter.hh
+++ b/dumux/io/pointcloudvtkwriter.hh
@@ -90,7 +90,7 @@ class PointCloudVtkWriter
         }
 
         /*!
-        * \brief Allows random acces to data
+        * \brief Allows random access to data
         *
         * \param idx The index
         */
diff --git a/dumux/io/rasterimagereader.hh b/dumux/io/rasterimagereader.hh
index 0e5304f9d6..341a14bfa4 100644
--- a/dumux/io/rasterimagereader.hh
+++ b/dumux/io/rasterimagereader.hh
@@ -80,7 +80,7 @@ public:
         Result() = delete;
 
         /*!
-         * \brief Contruct from data and header by copy
+         * \brief Construct from data and header by copy
          */
         Result(const std::vector<T>& data, const HeaderData& header)
         : Parent(data)
@@ -88,7 +88,7 @@ public:
         {}
 
         /*!
-         * \brief Contruct from data and header by move
+         * \brief Construct from data and header by move
          */
         Result(std::vector<T>&& data, HeaderData&& header)
         : Parent(std::move(data))
@@ -264,7 +264,7 @@ public:
                 headerData.nCols = std::stoi(std::string(tokens[0]));
                 headerData.nRows = std::stoi(std::string(tokens[1]));
 
-                // Grayscale images additionaly contain a maxium value in the header.
+                // Grayscale images additionally contain a maximum value in the header.
                 if (isGrayScale_(magicNumber))
                 {
                     std::getline(infile, inputLine);
diff --git a/dumux/io/vtk/function.hh b/dumux/io/vtk/function.hh
index 47f3744861..6c83fddd15 100644
--- a/dumux/io/vtk/function.hh
+++ b/dumux/io/vtk/function.hh
@@ -180,7 +180,7 @@ private:
  *        This expects the data to be organized by a two-dimensional field storing for
  *        each element the element-local nodal values. This can be used for the output
  *        of fields that are non-conforming due to e.g. constitutive relationships and
- *        where no extra degrees of freedom exist to disply the discontinuities.
+ *        where no extra degrees of freedom exist to display the discontinuities.
  *
  * \tparam GridView The Dune grid view type
  * \tparam Mapper The type used for mapping elements to indices in the field
diff --git a/dumux/io/vtk/vtkreader.hh b/dumux/io/vtk/vtkreader.hh
index db797d60ba..d3d7fdbc86 100644
--- a/dumux/io/vtk/vtkreader.hh
+++ b/dumux/io/vtk/vtkreader.hh
@@ -59,7 +59,7 @@ public:
     using Data = std::unordered_map<std::string, std::vector<double>>;
 
     /*!
-     * \brief The contructor creates a tinyxml2::XMLDocument from file
+     * \brief The constructor creates a tinyxml2::XMLDocument from file
      */
     explicit VTKReader(const std::string& fileName)
     {
@@ -143,7 +143,7 @@ public:
      * \brief Read a grid from a vtk/vtu/vtp file, ignoring cell and point data
      * \note use this signature if the factory might be needed outside to interpret the data via the factory's insertion indices
      * \param verbose if the output should be verbose
-     * \param factory the (emtpy) grid factory
+     * \param factory the (empty) grid factory
      */
     template<class Grid>
     std::unique_ptr<Grid> readGrid(Dune::GridFactory<Grid>& factory, bool verbose = false) const
@@ -160,7 +160,7 @@ public:
     /*!
      * \brief Read a grid from a vtk/vtu/vtp file, reading all cell and point data
      * \note the factory will be needed outside to interpret the data via the factory's insertion indices
-     * \param factory the (emtpy) grid factory
+     * \param factory the (empty) grid factory
      * \param cellData the cell data arrays to be filled
      * \param pointData the point data arrays to be filled
      * \param verbose if the output should be verbose
@@ -211,7 +211,7 @@ private:
 
     /*!
      * \brief Read a grid from a vtk/vtu/vtp file
-     * \param factory the (emtpy) grid factory
+     * \param factory the (empty) grid factory
      * \param verbose if the output should be verbose
      */
     template<class Grid>
diff --git a/dumux/io/xml/tinyxml2.h b/dumux/io/xml/tinyxml2.h
index 49bc615080..e8ea49ec9a 100644
--- a/dumux/io/xml/tinyxml2.h
+++ b/dumux/io/xml/tinyxml2.h
@@ -1790,7 +1790,7 @@ public:
     /// A (trivial) utility function that prints the ErrorStr() to stdout.
     void PrintError() const;
 
-    /// Return the line where the error occured, or zero if unknown.
+    /// Return the line where the error occurred, or zero if unknown.
     int ErrorLineNum() const
     {
         return _errorLineNum;
diff --git a/dumux/linear/istlsolverregistry.hh b/dumux/linear/istlsolverregistry.hh
index a2d6f2ecb5..67dc6ea2ed 100644
--- a/dumux/linear/istlsolverregistry.hh
+++ b/dumux/linear/istlsolverregistry.hh
@@ -33,7 +33,7 @@
  * Use this macro in namespace Dumux.
  * Example:
  * DUMUX_REGISTER_PRECONDITIONER("mypreconditioner", Dumux::MultiTypeBlockMatrixPreconditionerTag, Dune::defaultPreconditionerBlockLevelCreator<Dumux::MyPreconditioner, 1>());
- * Expicitly specifying the namespaces is required.
+ * Explicitly specifying the namespaces is required.
  * Set parameter Preconditioner.Type to "mypreconditioner" to use it through the factory.
  *
  * In the macro implementation, the final static_assert forces implementers
diff --git a/dumux/linear/matrixconverter.hh b/dumux/linear/matrixconverter.hh
index ea398feb3e..57403cd405 100644
--- a/dumux/linear/matrixconverter.hh
+++ b/dumux/linear/matrixconverter.hh
@@ -19,7 +19,7 @@
 /*!
  * \file
  * \ingroup Linear
- * \brief A helper classe that converts a Dune::MultiTypeBlockMatrix into a plain Dune::BCRSMatrix
+ * \brief A helper class that converts a Dune::MultiTypeBlockMatrix into a plain Dune::BCRSMatrix
  */
 #ifndef DUMUX_MATRIX_CONVERTER
 #define DUMUX_MATRIX_CONVERTER
@@ -38,7 +38,7 @@ namespace Dumux {
 
 /*!
  * \ingroup Linear
- * \brief A helper classe that converts a Dune::MultiTypeBlockMatrix into a plain Dune::BCRSMatrix
+ * \brief A helper class that converts a Dune::MultiTypeBlockMatrix into a plain Dune::BCRSMatrix
  * TODO: allow block sizes for BCRSMatrix other than 1x1 ?
  *
  */
@@ -197,7 +197,7 @@ private:
 
 /*!
  * \ingroup Linear
- * \brief A helper classe that converts a Dune::MultiTypeBlockVector into a plain Dune::BlockVector and transfers back values
+ * \brief A helper class that converts a Dune::MultiTypeBlockVector into a plain Dune::BlockVector and transfers back values
  */
 template<class MultiTypeBlockVector, class Scalar=double>
 class VectorConverter
@@ -233,7 +233,7 @@ public:
     }
 
     /*!
-     * \brief Copys the entries of a Dune::BlockVector to a Dune::MultiTypeBlockVector
+     * \brief Copies the entries of a Dune::BlockVector to a Dune::MultiTypeBlockVector
      *
      * \param x The multitype blockvector where the values are copied to
      * \param y The regular blockvector where the values are copied from
diff --git a/dumux/linear/preconditioners.hh b/dumux/linear/preconditioners.hh
index 149e927b6e..5f6eb57e4a 100644
--- a/dumux/linear/preconditioners.hh
+++ b/dumux/linear/preconditioners.hh
@@ -105,7 +105,7 @@ public:
      * \brief Constructor
      *
      * \param mat The matrix to operate on.
-     * \param params Collection of paramters.
+     * \param params Collection of parameters.
      */
 #if DUNE_VERSION_GTE(DUNE_ISTL,2,8)
     SeqUzawa(const std::shared_ptr<const Dune::AssembledLinearOperator<M,X,Y>>& op, const Dune::ParameterTree& params)
diff --git a/dumux/linear/seqsolverbackend.hh b/dumux/linear/seqsolverbackend.hh
index 8e2c3345f9..902f58475b 100644
--- a/dumux/linear/seqsolverbackend.hh
+++ b/dumux/linear/seqsolverbackend.hh
@@ -849,7 +849,7 @@ private:
  * http://faculty.cse.tamu.edu/davis/suitesparse.html
  *
  * You can choose from one of the following ordering strategies using the input
- * paramter "LinearSolver.UMFPackOrdering":
+ * parameter "LinearSolver.UMFPackOrdering":
  * \verbatim
  * 0: UMFPACK_ORDERING_CHOLMOD
  * 1: UMFPACK_ORDERING_AMD (default)
diff --git a/dumux/linear/solver.hh b/dumux/linear/solver.hh
index 0e73ac6b21..5d5e3f41f8 100644
--- a/dumux/linear/solver.hh
+++ b/dumux/linear/solver.hh
@@ -41,7 +41,7 @@ public:
     using Scalar = double;
 
     /*!
-     * \brief Contruct the solver
+     * \brief Construct the solver
      * \note Read parameters from the parameter tree
      *       - LinearSolver.Verbosity the verbosity level of the linear solver
      *       - LinearSolver.MaxIterations the maximum iterations of the solver
diff --git a/dumux/material/binarycoefficients/brine_co2.hh b/dumux/material/binarycoefficients/brine_co2.hh
index 2872ad6372..d77545b75c 100644
--- a/dumux/material/binarycoefficients/brine_co2.hh
+++ b/dumux/material/binarycoefficients/brine_co2.hh
@@ -266,7 +266,7 @@ private:
     }
 
     /*!
-     * \brief Returns the paramater A for the calculation of
+     * \brief Returns the parameter A for the calculation of
      * them mutual solubility in the water-CO2 system.
      * Given in Spycher, Pruess and Ennis-King (2003) \cite spycher2003 <BR>
      *
@@ -286,7 +286,7 @@ private:
     }
 
     /*!
-     * \brief Returns the paramater B for the calculation of
+     * \brief Returns the parameter B for the calculation of
      * the mutual solubility in the water-CO2 system.
      * Given in Spycher, Pruess and Ennis-King (2003) \cite spycher2003 <BR>
      *
diff --git a/dumux/material/chemistry/electrochemistry/electrochemistryni.hh b/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
index 507f6532bb..69fb98a705 100644
--- a/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
+++ b/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
@@ -70,7 +70,7 @@ public:
                                const std::string& paramGroup = "")
     {
         //correction to account for actually relevant reaction area
-        //current density has to be devided by the half length of the box
+        //current density has to be divided by the half length of the box
         //\todo Do we have multiply with the electrochemically active surface area (ECSA) here instead?
         static Scalar gridYMax = getParamFromGroup<GlobalPosition>(paramGroup, "Grid.UpperRight")[1];
         static Scalar nCellsY = getParamFromGroup<GlobalPosition>(paramGroup, "Grid.Cells")[1];
diff --git a/dumux/material/components/air.hh b/dumux/material/components/air.hh
index 6cc0501962..33c1241412 100644
--- a/dumux/material/components/air.hh
+++ b/dumux/material/components/air.hh
@@ -132,7 +132,7 @@ public:
     /*!
      * \brief The dynamic viscosity \f$\mathrm{[Pa*s]}\f$ of Air at a given pressure and temperature.
      *
-     * Criticial specific volume calculated by \f$V_c = (R*T_c)/p_c\f$.
+     * Critical specific volume calculated by \f$V_c = (R*T_c)/p_c\f$.
      *
      * Reid et al. (1987, pp 396-397, 667) \cite reid1987 <BR>
      * Poling et al. (2001, pp 9.7-9.8) \cite poling2001 <BR>
@@ -172,7 +172,7 @@ public:
         using std::sqrt;
         const Scalar mu = 40.785 * Fc * sqrt(M * temperature)/(cbrt(Vc * Vc) * Omega_v);
 
-        // convertion from micro poise to Pa s
+        // conversion from micro poise to Pa s
         return mu/1.0e6/10.0;
     }
 
diff --git a/dumux/material/components/brine.hh b/dumux/material/components/brine.hh
index 8bafa7414d..ef151984c8 100644
--- a/dumux/material/components/brine.hh
+++ b/dumux/material/components/brine.hh
@@ -355,7 +355,7 @@ public:
     * \brief The pressure of steam in \f$\mathrm{[Pa]}\f$ at a given density and temperature.
     *
     * \param temperature temperature of component in \f$\mathrm{[K]}\f$
-    * \param density denstiy of component in \f$\mathrm{[kg/m^3]}\f$
+    * \param density density of component in \f$\mathrm{[kg/m^3]}\f$
     */
    static Scalar gasPressure(Scalar temperature, Scalar density)
    { return H2O::gasPressure(temperature, density); }
diff --git a/dumux/material/components/co2.hh b/dumux/material/components/co2.hh
index 7be6c14464..2360aef3ee 100644
--- a/dumux/material/components/co2.hh
+++ b/dumux/material/components/co2.hh
@@ -348,7 +348,7 @@ public:
         {
             temperature = 275;
             Dune::dgrave << "Temperature below 275K in viscosity function:"
-                    << "Regularizing tempereature to 275K. " << std::endl;
+                    << "Regularizing temperature to 275K. " << std::endl;
         }
 
 
diff --git a/dumux/material/components/h2.hh b/dumux/material/components/h2.hh
index 7a77f26ce0..f51983d0bc 100644
--- a/dumux/material/components/h2.hh
+++ b/dumux/material/components/h2.hh
@@ -227,7 +227,7 @@ public:
             2.16178*exp(- 2.43787*Tstar);
         Scalar mu = 40.785*Fc*sqrt(M*temperature)/(pow(Vc, 2./3)*Omega_v);
 
-        // convertion from micro poise to Pa s
+        // conversion from micro poise to Pa s
         return mu/1e6 / 10;
     }
 };
diff --git a/dumux/material/components/n2.hh b/dumux/material/components/n2.hh
index accec3a4dc..98135f8e48 100644
--- a/dumux/material/components/n2.hh
+++ b/dumux/material/components/n2.hh
@@ -263,7 +263,7 @@ public:
             2.16178*exp(- 2.43787*Tstar);
         Scalar mu = 40.785*Fc*sqrt(M*temperature)/(pow(Vc, 2./3)*Omega_v);
 
-        // convertion from micro poise to Pa s
+        // conversion from micro poise to Pa s
         return mu/1e6 / 10;
     }
 
diff --git a/dumux/material/components/o2.hh b/dumux/material/components/o2.hh
index 7763512c7a..c853d14c58 100644
--- a/dumux/material/components/o2.hh
+++ b/dumux/material/components/o2.hh
@@ -238,7 +238,7 @@ public:
             2.16178*exp(- 2.43787*Tstar);
         Scalar mu = 40.785*Fc*sqrt(M*temperature)/(pow(Vc, 2./3)*Omega_v);
 
-        // convertion from micro poise to Pa s
+        // conversion from micro poise to Pa s
         return mu/1e6 / 10;
     }
 
diff --git a/dumux/material/components/tabulatedcomponent.hh b/dumux/material/components/tabulatedcomponent.hh
index 9ee1ca3a75..5a6967564d 100644
--- a/dumux/material/components/tabulatedcomponent.hh
+++ b/dumux/material/components/tabulatedcomponent.hh
@@ -906,7 +906,7 @@ private:
             return max(pressMax_, vaporPressure_[tempIdx] * 1.1);
     }
 
-    //! returns the minumum tabulized gas pressure at a given temperature index
+    //! returns the minimum tabulized gas pressure at a given temperature index
     static Scalar minGasPressure_(int tempIdx)
     {
         using std::min;
diff --git a/dumux/material/constants.hh b/dumux/material/constants.hh
index 0fb8be453e..771a307af0 100644
--- a/dumux/material/constants.hh
+++ b/dumux/material/constants.hh
@@ -19,7 +19,7 @@
 /*!
  * \file
  * \ingroup Material
- * \brief A central place for various physical constants occuring in
+ * \brief A central place for various physical constants occurring in
  *        some equations.
  */
 #ifndef DUMUX_CONSTANTS_HH
@@ -31,7 +31,7 @@ namespace Dumux {
 
 /*!
  * \ingroup Material
- * \brief A central place for various physical constants occuring in
+ * \brief A central place for various physical constants occurring in
  *        some equations.
  */
 template<class Scalar>
diff --git a/dumux/material/constraintsolvers/compositionfromfugacities.hh b/dumux/material/constraintsolvers/compositionfromfugacities.hh
index 5aade25c60..84b3111dff 100644
--- a/dumux/material/constraintsolvers/compositionfromfugacities.hh
+++ b/dumux/material/constraintsolvers/compositionfromfugacities.hh
@@ -20,7 +20,7 @@
  * \file
  * \ingroup ConstraintSolvers
  * \brief Determines the fluid composition given the component
- *        fugacities and an arbitary equation of state.
+ *        fugacities and an arbitrary equation of state.
  */
 #ifndef DUMUX_COMPOSITION_FROM_FUGACITIES_HH
 #define DUMUX_COMPOSITION_FROM_FUGACITIES_HH
diff --git a/dumux/material/constraintsolvers/immiscibleflash.hh b/dumux/material/constraintsolvers/immiscibleflash.hh
index 1c3a934be8..287b5e3ed0 100644
--- a/dumux/material/constraintsolvers/immiscibleflash.hh
+++ b/dumux/material/constraintsolvers/immiscibleflash.hh
@@ -80,7 +80,7 @@ public:
     using ComponentVector = Dune::FieldVector<Scalar, numComponents>;
 
     /*!
-     * \brief Contruct a new flash
+     * \brief Construct a new flash
      * \param wettingPhaseIdx the phase index of the wetting phase
      */
     explicit ImmiscibleFlash(int wettingPhaseIdx = 0)
diff --git a/dumux/material/constraintsolvers/ncpflash.hh b/dumux/material/constraintsolvers/ncpflash.hh
index f5567a629e..034fe38fac 100644
--- a/dumux/material/constraintsolvers/ncpflash.hh
+++ b/dumux/material/constraintsolvers/ncpflash.hh
@@ -91,7 +91,7 @@ public:
     using ComponentVector = Dune::FieldVector<Scalar, numComponents>;
 
     /*!
-     * \brief Contruct a new flash
+     * \brief Construct a new flash
      * \param wettingPhaseIdx the phase index of the wetting phase
      */
     explicit NcpFlash(int wettingPhaseIdx = 0)
diff --git a/dumux/material/eos/pengrobinson.hh b/dumux/material/eos/pengrobinson.hh
index aa81c029af..3b263430bd 100644
--- a/dumux/material/eos/pengrobinson.hh
+++ b/dumux/material/eos/pengrobinson.hh
@@ -182,7 +182,7 @@ public:
         // ignore the first two results if the smallest
         // compressibility factor is <= 0.0. (this means that if we
         // would get negative molar volumes for the liquid phase, we
-        // consider the liquid phase non-existant.)
+        // consider the liquid phase non-existent.)
         // Note that invertCubicPolynomial sorts the roots in ascending order
         if (numSol > 1 && Z[0] <= 0.0) {
             Z[0] = Z[numSol - 1];
@@ -435,7 +435,7 @@ protected:
 
         // Newton method to find first root
 
-        // if the values which we got on Vmin and Vmax are usefull, we
+        // if the values which we got on Vmin and Vmax are useful, we
         // will reuse them as initial value, else we will start 10%
         // above the covolume
         Scalar V = b*1.1;
diff --git a/dumux/material/fluidmatrixinteractions/2p/smoothedlinearlaw.hh b/dumux/material/fluidmatrixinteractions/2p/smoothedlinearlaw.hh
index 6f33091c44..a387ef0d56 100644
--- a/dumux/material/fluidmatrixinteractions/2p/smoothedlinearlaw.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/smoothedlinearlaw.hh
@@ -230,7 +230,7 @@ private:
             return 1.0;
         else if (S <= 0.0)
             return 0;
-        // check wether the permeability needs to be regularized
+        // check whether the permeability needs to be regularized
         else if (S < lowS)
             return splineLowS_.eval(S);
         else if (S > highS)
diff --git a/dumux/material/fluidmatrixinteractions/2p/splinemateriallaw.hh b/dumux/material/fluidmatrixinteractions/2p/splinemateriallaw.hh
index fedf502baa..de49573723 100644
--- a/dumux/material/fluidmatrixinteractions/2p/splinemateriallaw.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/splinemateriallaw.hh
@@ -63,7 +63,7 @@ public:
 
     /*!
      * \brief We are always regularized in the sense that we replace
-     *        the orginal curve by a cubic spline
+     *        the original curve by a cubic spline
      */
     static constexpr bool isRegularized()
     { return true; }
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/johansen.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/johansen.hh
index 24a2b3fb49..d084f8c9c6 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/johansen.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/johansen.hh
@@ -118,11 +118,11 @@ private:
         const Scalar rhoBulk = rhoSolid*porosity;
 
         using std::pow;
-        const Scalar lSat = lambdaSolid * pow(lambdaW / lambdaSolid, porosity);
-        const Scalar lDry = (0.135*rhoBulk + 64.7)/(rhoSolid - 0.947*rhoBulk);
+        const Scalar lambdaSaturated = lambdaSolid * pow(lambdaW / lambdaSolid, porosity);
+        const Scalar lambdaDry = (0.135*rhoBulk + 64.7)/(rhoSolid - 0.947*rhoBulk);
         const Scalar Ke = (kappa*satW)/(1+(kappa-1)*satW);// Kersten number, equation 13
 
-        return lDry + Ke * (lSat - lDry); // equation 14
+        return lambdaDry + Ke * (lambdaSaturated - lambdaDry); // equation 14
     }
 };
 } // end namespace Dumux
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/somerton.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/somerton.hh
index 23cc82fccc..547443c481 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/somerton.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivity/somerton.hh
@@ -116,10 +116,10 @@ private:
         using std::sqrt;
         const Scalar satLiquidPhysical = max<Scalar>(0.0, satLiquid);
         // geometric mean, using ls^(1-p)*l^p = ls*(l/ls)^p
-        const Scalar lSat = lambdaSolid * pow(lambdaLiquid / lambdaSolid, porosity);
-        const Scalar lDry = lambdaSolid * pow(lambdaGas / lambdaSolid, porosity);
+        const Scalar lambdaSaturated = lambdaSolid * pow(lambdaLiquid / lambdaSolid, porosity);
+        const Scalar lambdaDry = lambdaSolid * pow(lambdaGas / lambdaSolid, porosity);
 
-        return lDry + sqrt(satLiquidPhysical) * (lSat - lDry);
+        return lambdaDry + sqrt(satLiquidPhysical) * (lambdaSaturated - lambdaDry);
     }
 };
 
diff --git a/dumux/material/fluidmatrixinteractions/3p/parkervangenuchten.hh b/dumux/material/fluidmatrixinteractions/3p/parkervangenuchten.hh
index 40dc3a00ed..1ec8379149 100644
--- a/dumux/material/fluidmatrixinteractions/3p/parkervangenuchten.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/parkervangenuchten.hh
@@ -814,9 +814,9 @@ private:
     /*!
      * \brief The regularized capillary pressure-saturation curve for the gas and nonwetting phase
      * regularized part:
-     *  - low saturation:  extend the \f$\mathrm{p_{cgn}(S_{te})}\f$ curve with the slope at the regularization point (i.e. no kink).
+     *  - low saturation:  extend the \f$\mathrm{p_{cgn}(S_{teff})}\f$ curve with the slope at the regularization point (i.e. no kink).
      *  - high saturation: connect the high regularization point with
-     *                     with a spline and continue linearly for \f$\mathrm{S_{te} > 1}\f$
+     *                     with a spline and continue linearly for \f$\mathrm{S_{teff} > 1}\f$
      * \param ste Effective total liquid (sw + sn) saturation
      */
     OptionalScalar<Scalar> pcgn(Scalar ste) const
diff --git a/dumux/material/fluidmatrixinteractions/frictionlaws/frictionlaw.hh b/dumux/material/fluidmatrixinteractions/frictionlaws/frictionlaw.hh
index 87bc13afa7..6bb6c539d7 100644
--- a/dumux/material/fluidmatrixinteractions/frictionlaws/frictionlaw.hh
+++ b/dumux/material/fluidmatrixinteractions/frictionlaws/frictionlaw.hh
@@ -60,7 +60,7 @@ public:
      *
      * We define a water depth minUpperH. If the water depth is
      * smaller, we start to limit the friction.
-     * So the friction term get's not extreme large for small water
+     * So the friction term gets not extreme large for small water
      * depths.
      *
      * ------------------------- minUpperH -----------
@@ -74,11 +74,11 @@ public:
      *
      * For the limiting the LET model is used, which is usually applied in the
      * porous media flow to limit the permeability due to the saturation. It employs
-     * the three empirical paramaters L, E and T, which describe the limiting curve (mobility).
+     * the three empirical parameters L, E and T, which describe the limiting curve (mobility).
      *
      * auto mobility = (mobility_max * pow(sw,L))/(pow(sw,L) + E * pow(1.0-sw,T));
      *
-     * For the limitation of the roughness height L = 0.0, T = 2.0 and E = 1.0 are choosen.
+     * For the limitation of the roughness height L = 0.0, T = 2.0 and E = 1.0 are chosen.
      * Therefore the calculation of the mobility is simplified significantly.
      *
      * \param roughnessHeight roughness height of the representative structure (e.g. largest grain size).
diff --git a/dumux/material/fluidmatrixinteractions/porenetwork/throat/transmissibility2p.hh b/dumux/material/fluidmatrixinteractions/porenetwork/throat/transmissibility2p.hh
index df931fa59c..20fb03cea7 100644
--- a/dumux/material/fluidmatrixinteractions/porenetwork/throat/transmissibility2p.hh
+++ b/dumux/material/fluidmatrixinteractions/porenetwork/throat/transmissibility2p.hh
@@ -124,7 +124,7 @@ struct RansohoffRadke
 
 namespace NonWettingPhaseTransmissibility {
 
-//! TODO: evalute and maybe remove
+//! TODO: evaluate and maybe remove
 template<class Scalar>
 struct Mogensen
 {
@@ -147,7 +147,7 @@ struct Mogensen
     }
 };
 
-//! TODO: evalute and maybe remove
+//! TODO: evaluate and maybe remove
 template<class Scalar, class SinglePhaseTransmissibilityLaw>
 struct Valvatne
 {
diff --git a/dumux/material/fluidstates/pseudo1p2c.hh b/dumux/material/fluidstates/pseudo1p2c.hh
index 9eb91bd5a9..a1a80e3e70 100644
--- a/dumux/material/fluidstates/pseudo1p2c.hh
+++ b/dumux/material/fluidstates/pseudo1p2c.hh
@@ -58,7 +58,7 @@ public:
         comp1Idx = FluidSystem::comp1Idx
     };
 
-    /*! \name Acess functions */
+    /*! \name Access functions */
     //@{
     /*!
      * \brief Returns the saturation \f$S_\alpha\f$ of a fluid phase \f$\alpha\f$ in \f$\mathrm{[-]}\f$.
diff --git a/dumux/material/fluidsystems/2p1c.hh b/dumux/material/fluidsystems/2p1c.hh
index d1bbdb24cc..a858be0f52 100644
--- a/dumux/material/fluidsystems/2p1c.hh
+++ b/dumux/material/fluidsystems/2p1c.hh
@@ -101,7 +101,7 @@ public:
      *
      * We define an ideal mixture as a fluid phase where the fugacity
      * coefficients of all components times the pressure of the phase
-     * are indepent on the fluid composition. This assumtion is true
+     * are independent on the fluid composition. This assumption is true
      * if Henry's law and Raoult's law apply. If you are unsure what
      * this function should return, it is safe to return false. The
      * only damage done will be (slightly) increased computation times
diff --git a/dumux/material/fluidsystems/2pimmiscible.hh b/dumux/material/fluidsystems/2pimmiscible.hh
index def153e834..c474849176 100644
--- a/dumux/material/fluidsystems/2pimmiscible.hh
+++ b/dumux/material/fluidsystems/2pimmiscible.hh
@@ -73,7 +73,7 @@ public:
 
     static constexpr int phase0Idx = 0; //!< index of the first phase
     static constexpr int phase1Idx = 1; //!< index of the second phase
-    static constexpr int comp0Idx = 0; //!< index of the frist component
+    static constexpr int comp0Idx = 0; //!< index of the first component
     static constexpr int comp1Idx = 1; //!< index of the second component
 
     /****************************************
@@ -415,7 +415,7 @@ public:
      * \param phaseIdx Index of the fluid phase
      * \param compIdx index of the component
      *
-     * Molecular diffusion of a compoent \f$\mathrm{\kappa}\f$ is caused by a
+     * Molecular diffusion of a component \f$\mathrm{\kappa}\f$ is caused by a
      * gradient of the chemical potential and follows the law
      *
      * \f[ J = - D \mathbf{grad} \mu_\kappa \f]
diff --git a/dumux/material/fluidsystems/3pimmiscible.hh b/dumux/material/fluidsystems/3pimmiscible.hh
index 5976f5e67c..7c1ae81e7c 100644
--- a/dumux/material/fluidsystems/3pimmiscible.hh
+++ b/dumux/material/fluidsystems/3pimmiscible.hh
@@ -466,7 +466,7 @@ public:
      * \param phaseIdx Index of the fluid phase
      * \param compIdx index of the component
      *
-     * Molecular diffusion of a compoent \f$\mathrm{\kappa}\f$ is caused by a
+     * Molecular diffusion of a component \f$\mathrm{\kappa}\f$ is caused by a
      * gradient of the chemical potential and follows the law
      *
      * \f[ J = - D \mathbf{grad} \mu_\kappa \f]
diff --git a/dumux/material/fluidsystems/brine.hh b/dumux/material/fluidsystems/brine.hh
index c10fd6eccf..dac95ea24d 100644
--- a/dumux/material/fluidsystems/brine.hh
+++ b/dumux/material/fluidsystems/brine.hh
@@ -99,7 +99,7 @@ public:
      *
      * We define an ideal mixture as a fluid phase where the fugacity
      * coefficients of all components times the pressure of the phase
-     * are indepent on the fluid composition. This assumtion is true
+     * are independent on the fluid composition. This assumption is true
      * if Henry's law and Raoult's law apply. If you are unsure what
      * this function should return, it is safe to return false. The
      * only damage done will be (slightly) increased computation times
diff --git a/dumux/material/fluidsystems/brineco2.hh b/dumux/material/fluidsystems/brineco2.hh
index 03b7075a7d..4b0a027e7d 100644
--- a/dumux/material/fluidsystems/brineco2.hh
+++ b/dumux/material/fluidsystems/brineco2.hh
@@ -137,7 +137,7 @@ class BrineCO2
     //!
     //! depending on the implementation this is either brine (pseudo-component) or H2O
     static constexpr int BrineOrH2OIdx = 0;
-    //! if the implementation considers NaCl as a real compoent, it gets the index 2
+    //! if the implementation considers NaCl as a real component, it gets the index 2
     static constexpr int NaClIdx = 2;
 
 public:
@@ -478,7 +478,7 @@ public:
             assert(T > 0);
             assert(pl > 0 && pg > 0);
 
-            // calulate the equilibrium composition for given T & p
+            // calculate the equilibrium composition for given T & p
             Scalar xlH2O, xgH2O;
             Scalar xlCO2, xgCO2;
             const Scalar salinity = useConstantSalinity ? ConstantSalinityBrine::salinity()
@@ -530,7 +530,7 @@ public:
         Scalar xgH2O;
         Scalar xlCO2;
 
-        // calulate the equilibrium composition for given T & p
+        // calculate the equilibrium composition for given T & p
         const Scalar salinity = useConstantSalinity ? ConstantSalinityBrine::salinity()
                                                     : fluidState.massFraction(liquidPhaseIdx, NaClIdx);
         Brine_CO2::calculateMoleFractions(T, p, salinity, /*knowgasPhaseIdx=*/-1, xlCO2, xgH2O);
@@ -549,7 +549,7 @@ public:
      * \brief Calculate the molecular diffusion coefficient for a
      *        component in a fluid phase \f$\mathrm{[mol^2 * s / (kg*m^3)]}\f$
      *
-     * Molecular diffusion of a compoent \f$\mathrm{\kappa}\f$ is caused by a
+     * Molecular diffusion of a component \f$\mathrm{\kappa}\f$ is caused by a
      * gradient of the chemical potential and follows the law
      *
      * \f[ J = - D \textbf{grad} mu_\kappa \f]
diff --git a/dumux/material/fluidsystems/h2oair.hh b/dumux/material/fluidsystems/h2oair.hh
index 9c5a8ece47..e111f6a35c 100644
--- a/dumux/material/fluidsystems/h2oair.hh
+++ b/dumux/material/fluidsystems/h2oair.hh
@@ -88,9 +88,9 @@ public:
     static constexpr int phase0Idx = liquidPhaseIdx; //!< index of the first phase
     static constexpr int phase1Idx = gasPhaseIdx; //!< index of the second phase
 
-    static constexpr int H2OIdx = 0; //!< index of the frist component
+    static constexpr int H2OIdx = 0; //!< index of the first component
     static constexpr int AirIdx = 1; //!< index of the second component
-    static constexpr int comp0Idx = H2OIdx; //!< index of the frist component
+    static constexpr int comp0Idx = H2OIdx; //!< index of the first component
     static constexpr int comp1Idx = AirIdx; //!< index of the second component
     static constexpr int liquidCompIdx = H2OIdx; //!< index of the liquid component
     static constexpr int gasCompIdx = AirIdx; //!< index of the gas component
diff --git a/dumux/material/fluidsystems/h2oheavyoil.hh b/dumux/material/fluidsystems/h2oheavyoil.hh
index fa548a1214..e56f6a37b3 100644
--- a/dumux/material/fluidsystems/h2oheavyoil.hh
+++ b/dumux/material/fluidsystems/h2oheavyoil.hh
@@ -157,7 +157,7 @@ public:
      *
      * We define an ideal mixture as a fluid phase where the fugacity
      * coefficients of all components times the pressure of the phase
-     * are indepent on the fluid composition. This assumtion is true
+     * are independent on the fluid composition. This assumption is true
      * if Henry's law and Raoult's law apply. If you are unsure what
      * this function should return, it is safe to return false. The
      * only damage done will be (slightly) increased computation times
diff --git a/dumux/material/fluidsystems/h2on2.hh b/dumux/material/fluidsystems/h2on2.hh
index 1d7114db5e..521ddddb5f 100644
--- a/dumux/material/fluidsystems/h2on2.hh
+++ b/dumux/material/fluidsystems/h2on2.hh
@@ -572,7 +572,7 @@ public:
      * \brief Calculate the molecular diffusion coefficient for a
      *        component in a fluid phase \f$\mathrm{[mol^2 * s / (kg*m^3)]}\f$
      *
-     * Molecular diffusion of a compoent \f$\mathrm{\kappa}\f$ is caused by a
+     * Molecular diffusion of a component \f$\mathrm{\kappa}\f$ is caused by a
      * gradient of the chemical potential and follows the law
      *
      * \f[ J = - D \mathbf{grad} \mu_\kappa \f]
diff --git a/dumux/material/fluidsystems/h2on2o2.hh b/dumux/material/fluidsystems/h2on2o2.hh
index 728e4e2d4c..1634245c45 100644
--- a/dumux/material/fluidsystems/h2on2o2.hh
+++ b/dumux/material/fluidsystems/h2on2o2.hh
@@ -640,7 +640,7 @@ public:
      * \brief Calculate the molecular diffusion coefficient for a
      *        component in a fluid phase \f$\mathrm{[mol^2 * s / (kg*m^3)]}\f$
      *
-     * Molecular diffusion of a compoent \f$\kappa\f$ is caused by a
+     * Molecular diffusion of a component \f$\kappa\f$ is caused by a
      * gradient of the chemical potential and follows the law
      *
      * \f[ J = - D \mathbf{grad} \mu_\kappa \f]
diff --git a/dumux/material/fluidsystems/liquidphase2c.hh b/dumux/material/fluidsystems/liquidphase2c.hh
index 16c2f8592a..44ed3c9a08 100644
--- a/dumux/material/fluidsystems/liquidphase2c.hh
+++ b/dumux/material/fluidsystems/liquidphase2c.hh
@@ -57,7 +57,7 @@ public:
     static constexpr int liquidPhaseIdx = 0; //!< index of the liquid phase
     static constexpr int phase0Idx = liquidPhaseIdx; //!< index of the only phase
 
-    static constexpr int comp0Idx = 0; //!< index of the frist component
+    static constexpr int comp0Idx = 0; //!< index of the first component
     static constexpr int comp1Idx = 1; //!< index of the second component
     static constexpr int mainCompIdx = comp0Idx; //!< index of the main component
     static constexpr int secondCompIdx = comp1Idx; //!< index of the secondary component
diff --git a/dumux/material/fluidsystems/spe5.hh b/dumux/material/fluidsystems/spe5.hh
index 12322ac72e..3074202a73 100644
--- a/dumux/material/fluidsystems/spe5.hh
+++ b/dumux/material/fluidsystems/spe5.hh
@@ -476,7 +476,7 @@ public:
      * \brief Calculate the binary molecular diffusion coefficient for
      *        a component in a fluid phase \f$\mathrm{[mol^2 * s / (kg*m^3)]}\f$
      *
-     * Molecular diffusion of a compoent \f$\mathrm{\kappa}\f$ is caused by a
+     * Molecular diffusion of a component \f$\mathrm{\kappa}\f$ is caused by a
      * gradient of the chemical potential and follows the law
      *
      * \f[ J = - D grad \mu_\kappa \f]
diff --git a/dumux/material/gstatrandomfield.hh b/dumux/material/gstatrandomfield.hh
index f18d5fe35a..583ce93626 100644
--- a/dumux/material/gstatrandomfield.hh
+++ b/dumux/material/gstatrandomfield.hh
@@ -44,7 +44,7 @@ namespace Dumux {
  * or \cite Pebesma1998a).
  *
  * To use this class, execute the installexternal.py from your DuMuX root
- * directory or donwload, unpack and install the tarball from the gstat-website.
+ * directory or download, unpack and install the tarball from the gstat-website.
  * Then rerun cmake (in the second case set GSTAT_ROOT in your input file to the
  * path where gstat is installed).
  */
diff --git a/dumux/multidomain/boundary/freeflowporenetwork/couplingconditions.hh b/dumux/multidomain/boundary/freeflowporenetwork/couplingconditions.hh
index 24dfd86bbf..f864f0fe9b 100644
--- a/dumux/multidomain/boundary/freeflowporenetwork/couplingconditions.hh
+++ b/dumux/multidomain/boundary/freeflowporenetwork/couplingconditions.hh
@@ -156,7 +156,7 @@ public:
         const auto& frontalInternalScvf = (*scvfs(fvGeometry, scv).begin());
         momentumFlux[scvf.normalAxis()] -= 2*VelocityGradients::velocityGradII(fvGeometry, frontalInternalScvf, elemVolVars) * pnmViscosity;
 
-        // We do NOT consider the intertia term here. If included, Newton convergence decreases drastically and the solution even does not converge to a reference solution.
+        // We do NOT consider the inertia term here. If included, Newton convergence decreases drastically and the solution even does not converge to a reference solution.
         // We furthermore assume creeping flow within the boundary layer thus neglecting this term is physically justified.
 
         momentumFlux[scvf.normalAxis()] *= scvf.directionSign();
diff --git a/dumux/multidomain/boundary/freeflowporenetwork/ffmassporenetwork/couplingmanager.hh b/dumux/multidomain/boundary/freeflowporenetwork/ffmassporenetwork/couplingmanager.hh
index 7e4e29e5e2..3a4fe6d008 100644
--- a/dumux/multidomain/boundary/freeflowporenetwork/ffmassporenetwork/couplingmanager.hh
+++ b/dumux/multidomain/boundary/freeflowporenetwork/ffmassporenetwork/couplingmanager.hh
@@ -85,7 +85,7 @@ private:
     {
         SubControlVolume<poreNetworkIndex> scv;
         VolumeVariables<poreNetworkIndex> volVars;
-        mutable VelocityVector velocity; // velocity needs to be set externally, not availabe in this class
+        mutable VelocityVector velocity; // velocity needs to be set externally, not available in this class
     };
 
     struct PoreNetworkCouplingContext
@@ -93,7 +93,7 @@ private:
         SubControlVolume<freeFlowMassIndex> scv;
         SubControlVolumeFace<freeFlowMassIndex> scvf;
         VolumeVariables<freeFlowMassIndex> volVars;
-        mutable VelocityVector velocity; // velocity needs to be set externally, not availabe in this class
+        mutable VelocityVector velocity; // velocity needs to be set externally, not available in this class
     };
 
     using CouplingMapper = StaggeredFreeFlowPoreNetworkCouplingMapper;
diff --git a/dumux/multidomain/boundary/freeflowporenetwork/snappygridmanager.hh b/dumux/multidomain/boundary/freeflowporenetwork/snappygridmanager.hh
index 4ac719bb81..0aaf5429b6 100644
--- a/dumux/multidomain/boundary/freeflowporenetwork/snappygridmanager.hh
+++ b/dumux/multidomain/boundary/freeflowporenetwork/snappygridmanager.hh
@@ -358,7 +358,7 @@ public:
                 for (auto x : pointsOnLine)
                     std::cout << x.pos << std::endl;
 
-                // check for user-defined addtional points in the upstream area
+                // check for user-defined additional points in the upstream area
                 const ScalarVector upstreamPositions = getParamFromGroup<ScalarVector>(modelParamGroup, "Grid.UpstreamPositions" + std::to_string(i), ScalarVector{});
 
                 addUpstreamPositions_(i, upstreamPositions, positions, pointsOnLine);
@@ -367,7 +367,7 @@ public:
                 addCouplingPositions_(i, positions, pointsOnLine, interFacePositions, lowerLeft, upperRight);
                 addCouplingCells_(i, cells, pointsOnLine);
 
-                // check for user-defined addtional points in the downstream area
+                // check for user-defined additional points in the downstream area
                 const ScalarVector downstreamPositions = getParamFromGroup<ScalarVector>(modelParamGroup, "Grid.DownstreamPositions" + std::to_string(i), ScalarVector{});
 
                 addDownstreamPositions_(i, downstreamPositions, positions, upperRight);
diff --git a/dumux/multidomain/boundary/freeflowporousmedium/couplingconditions.hh b/dumux/multidomain/boundary/freeflowporousmedium/couplingconditions.hh
index 53906c32e8..6603b58268 100644
--- a/dumux/multidomain/boundary/freeflowporousmedium/couplingconditions.hh
+++ b/dumux/multidomain/boundary/freeflowporousmedium/couplingconditions.hh
@@ -57,19 +57,19 @@ struct FreeFlowPorousMediumCouplingOptions
      */
     enum class DiffusionCoefficientAveragingType
     {
-        harmonic, arithmethic, ffOnly, pmOnly
+        harmonic, arithmetic, ffOnly, pmOnly
     };
 
     /*!
-     * \brief Convenience function to convert user input given as std::string to the corresponding enum class used for chosing the type
+     * \brief Convenience function to convert user input given as std::string to the corresponding enum class used for choosing the type
      *        of averaging of the diffusion/conduction parameter at the interface between the two domains.
      */
     static DiffusionCoefficientAveragingType stringToEnum(DiffusionCoefficientAveragingType, const std::string& diffusionCoefficientAveragingType)
     {
         if (diffusionCoefficientAveragingType == "Harmonic")
             return DiffusionCoefficientAveragingType::harmonic;
-        else if (diffusionCoefficientAveragingType == "Arithmethic")
-            return DiffusionCoefficientAveragingType::arithmethic;
+        else if (diffusionCoefficientAveragingType == "Arithmetic")
+            return DiffusionCoefficientAveragingType::arithmetic;
         else if (diffusionCoefficientAveragingType == "FreeFlowOnly")
             return DiffusionCoefficientAveragingType::ffOnly;
         else if (diffusionCoefficientAveragingType == "PorousMediumOnly")
@@ -236,7 +236,7 @@ protected:
             return harmonicMean(avgQuantityI, avgQuantityJ, insideDistance, outsideDistance)
                    / totalDistance;
         }
-        else if(diffCoeffAvgType == DiffusionCoefficientAveragingType::arithmethic)
+        else if(diffCoeffAvgType == DiffusionCoefficientAveragingType::arithmetic)
         {
             return arithmeticMean(avgQuantityI, avgQuantityJ, insideDistance, outsideDistance)
                    / totalDistance;
@@ -262,7 +262,7 @@ protected:
     }
 
     /*!
-     * \brief Returns the conductive energy flux acorss the interface.
+     * \brief Returns the conductive energy flux across the interface.
      */
     template<std::size_t i, std::size_t j, bool isNI = enableEnergyBalance, typename std::enable_if_t<isNI, int> = 0>
     Scalar conductiveEnergyFlux_(Dune::index_constant<i> domainI,
diff --git a/dumux/multidomain/boundary/freeflowporousmedium/ffmasspm/couplingmanager.hh b/dumux/multidomain/boundary/freeflowporousmedium/ffmasspm/couplingmanager.hh
index 0a54d2657d..0ce9d14322 100644
--- a/dumux/multidomain/boundary/freeflowporousmedium/ffmasspm/couplingmanager.hh
+++ b/dumux/multidomain/boundary/freeflowporousmedium/ffmasspm/couplingmanager.hh
@@ -89,7 +89,7 @@ private:
         std::size_t dofIdx;
         std::size_t freeFlowMassScvfIdx;
         std::size_t porousMediumScvfIdx;
-        mutable VelocityVector velocity; // velocity needs to be set externally, not availabe in this class
+        mutable VelocityVector velocity; // velocity needs to be set externally, not available in this class
     };
 
     struct PorousMediumCouplingContext
@@ -100,7 +100,7 @@ private:
         std::size_t dofIdx;
         std::size_t porousMediumScvfIdx;
         std::size_t freeFlowMassScvfIdx;
-        mutable VelocityVector velocity; // velocity needs to be set externally, not availabe in this class
+        mutable VelocityVector velocity; // velocity needs to be set externally, not available in this class
     };
 
     using CouplingMapper = DarcyDarcyBoundaryCouplingMapper<MDTraits>; // TODO rename/generalize class
diff --git a/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh b/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh
index d5e1776373..c768126d90 100644
--- a/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh
+++ b/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh
@@ -50,19 +50,19 @@ struct StokesDarcyCouplingOptions
      */
     enum class DiffusionCoefficientAveragingType
     {
-        harmonic, arithmethic, ffOnly, pmOnly
+        harmonic, arithmetic, ffOnly, pmOnly
     };
 
     /*!
-     * \brief Convenience function to convert user input given as std::string to the corresponding enum class used for chosing the type
+     * \brief Convenience function to convert user input given as std::string to the corresponding enum class used for choosing the type
      *        of averaging of the diffusion/conduction parameter at the interface between the two domains.
      */
     static DiffusionCoefficientAveragingType stringToEnum(DiffusionCoefficientAveragingType, const std::string& diffusionCoefficientAveragingType)
     {
         if (diffusionCoefficientAveragingType == "Harmonic")
             return DiffusionCoefficientAveragingType::harmonic;
-        else if (diffusionCoefficientAveragingType == "Arithmethic")
-            return DiffusionCoefficientAveragingType::arithmethic;
+        else if (diffusionCoefficientAveragingType == "Arithmetic")
+            return DiffusionCoefficientAveragingType::arithmetic;
         else if (diffusionCoefficientAveragingType == "FreeFlowOnly")
             return DiffusionCoefficientAveragingType::ffOnly;
         else if (diffusionCoefficientAveragingType == "PorousMediumOnly")
@@ -360,7 +360,7 @@ protected:
             return harmonicMean(avgQuantityI, avgQuantityJ, insideDistance, outsideDistance)
                    / totalDistance;
         }
-        else if(diffCoeffAvgType == DiffusionCoefficientAveragingType::arithmethic)
+        else if(diffCoeffAvgType == DiffusionCoefficientAveragingType::arithmetic)
         {
             return arithmeticMean(avgQuantityI, avgQuantityJ, insideDistance, outsideDistance)
                    / totalDistance;
@@ -386,7 +386,7 @@ protected:
     }
 
     /*!
-     * \brief Returns the conductive energy flux acorss the interface.
+     * \brief Returns the conductive energy flux across the interface.
      */
     template<std::size_t i, std::size_t j, bool isNI = enableEnergyBalance, typename std::enable_if_t<isNI, int> = 0>
     Scalar conductiveEnergyFlux_(Dune::index_constant<i> domainI,
@@ -1024,7 +1024,7 @@ protected:
 
         reducedDiffusionMatrixOutside.solve(helperVector, gradientVectorij);
 
-        //Bi^-1 omegai rho_i (x*-xi). As we previously multiplied rho_i and omega_i wit the insidematrix, this does not need to be done again
+        //Bi^-1 omegai rho_i (x*-xi). As we previously multiplied rho_i and omega_i with the insidematrix, this does not need to be done again
         helperVector -=moleFracInside;
         reducedDiffusionMatrixInside.mv(helperVector, reducedFlux);
 
diff --git a/dumux/multidomain/couplingmanager.hh b/dumux/multidomain/couplingmanager.hh
index 3dfc46c627..06f08061dd 100644
--- a/dumux/multidomain/couplingmanager.hh
+++ b/dumux/multidomain/couplingmanager.hh
@@ -188,7 +188,7 @@ public:
      *       the primary variables at the degree of freedom location with index dofIdxGlobalJ
      * \note  the element whose residual is to be evaluated can be retrieved from the local assembler
      *        as localAssemblerI.element()
-     * \note  per default, we udpate the solution vector, if the element residual of domain i depends on more than
+     * \note  per default, we update the solution vector, if the element residual of domain i depends on more than
      *        the primary variables of domain j update the other dependent data here by overloading this function
      */
     template<std::size_t i, std::size_t j, class LocalAssemblerI>
diff --git a/dumux/multidomain/embedded/couplingmanager1d3d_projection.hh b/dumux/multidomain/embedded/couplingmanager1d3d_projection.hh
index d3eebf8652..bd4f050378 100644
--- a/dumux/multidomain/embedded/couplingmanager1d3d_projection.hh
+++ b/dumux/multidomain/embedded/couplingmanager1d3d_projection.hh
@@ -289,7 +289,7 @@ class Embedded1d3dCouplingManager;
  *
  * The network is represented as a line segment network. The bulk domain explicitly resolves the wall
  * of the tube network (e.g. blood vessel wall, outer root wall), so this generally requires an unstructured grid.
- * The coupling term coupling the PDEs on the network and in the bulk domain is intergrated over the
+ * The coupling term coupling the PDEs on the network and in the bulk domain is integrated over the
  * coupling surface and each integration point couples to quantities evaluated at the closest point on the graph.
  * There is a unique mapping from every point on the virtual tube surface to the tube centerline, therefore
  * this coupling is determined by mapping to the closest point on the virtual surface and then evaluating
@@ -322,7 +322,7 @@ class Embedded1d3dCouplingManager;
  *   - MixedDimension.Projection.CoupledAngleFactor
  *         angle threshold in which to search for coupled elements (angle in radians from surface normal vector, default 0.3)
  *   - MixedDimension.Projection.ConsiderFacesWithinBoundingBoxCoupled
- *         determines if all 3D boundary facets within the mesh bounding box should be consideres as coupling faces
+ *         determines if all 3D boundary facets within the mesh bounding box should be considered as coupling faces
  *   - MixedDimension.Projection.CoupledBoundingBoxShrinkingFactor
  *         if ConsiderFacesWithinBoundingBoxCoupled=true shrink the bounding box in all directions by this factor
  *
diff --git a/dumux/multidomain/embedded/couplingmanagerbase.hh b/dumux/multidomain/embedded/couplingmanagerbase.hh
index a8c9d7e5da..6b6c183b4f 100644
--- a/dumux/multidomain/embedded/couplingmanagerbase.hh
+++ b/dumux/multidomain/embedded/couplingmanagerbase.hh
@@ -234,7 +234,7 @@ public:
      */
     void computePointSourceData(std::size_t order = 1, bool verbose = false)
     {
-        // initilize the maps
+        // initialize the maps
         // do some logging and profiling
         Dune::Timer watch;
         std::cout << "Initializing the point sources..." << std::endl;
diff --git a/dumux/multidomain/embedded/integrationpointsource.hh b/dumux/multidomain/embedded/integrationpointsource.hh
index eb29423a91..faf547e3ec 100644
--- a/dumux/multidomain/embedded/integrationpointsource.hh
+++ b/dumux/multidomain/embedded/integrationpointsource.hh
@@ -80,7 +80,7 @@ public:
     void setIntegrationElement(const Scalar ie)
     { integrationElement_ = ie; }
 
-    //! The index of the element this intergration point source is associated with
+    //! The index of the element this integration point source is associated with
     std::size_t elementIndex() const
     { return elementIndex_; }
 
@@ -141,7 +141,7 @@ public:
                         if (intersectsPointGeometry(globalPos, scv.geometry()))
                             scvIndices.push_back(scv.indexInElement());
 
-                    // for all scvs that where tested positiv add the point sources
+                    // for all scvs that where tested positive add the point sources
                     // to the element/scv to point source map
                     for (auto scvIdx : scvIndices)
                     {
diff --git a/dumux/multidomain/embedded/localrefinementquadrature.hh b/dumux/multidomain/embedded/localrefinementquadrature.hh
index e71371d71a..5c55e9ef1c 100644
--- a/dumux/multidomain/embedded/localrefinementquadrature.hh
+++ b/dumux/multidomain/embedded/localrefinementquadrature.hh
@@ -46,7 +46,7 @@ namespace Dumux {
  *
  * This can be used, e.g. for low-order integration of the coupling term
  * in the projection scheme over the interface facets.
- * Each facet may be coupled to mulitple 1D elements.
+ * Each facet may be coupled to multiple 1D elements.
  * See Koch (2021) https://arxiv.org/abs/2106.06358 which also describes this algorithm.
  */
 template<class Geometry, class IndicatorFunction>
diff --git a/dumux/multidomain/facet/box/couplingmanager.hh b/dumux/multidomain/facet/box/couplingmanager.hh
index 0f8066ad72..8353c6ba1b 100644
--- a/dumux/multidomain/facet/box/couplingmanager.hh
+++ b/dumux/multidomain/facet/box/couplingmanager.hh
@@ -738,7 +738,7 @@ public:
             assert(it != couplingElementStencil.end());
             const auto idxInContext = std::distance(couplingElementStencil.begin(), it);
 
-            // get neighboring bulk element from the bulk context (is the same elemet as first entry in low dim context)
+            // get neighboring bulk element from the bulk context (is the same element as first entry in low dim context)
             const auto& bulkElement = this->problem(bulkId).gridGeometry().element(bulkContext_.elementIdx);
             const auto& bulkFvGeometry = *lowDimContext_.bulkFvGeometries[0];
 
diff --git a/dumux/multidomain/facet/box/fvgridgeometry.hh b/dumux/multidomain/facet/box/fvgridgeometry.hh
index 0c125b0c5c..705f886325 100644
--- a/dumux/multidomain/facet/box/fvgridgeometry.hh
+++ b/dumux/multidomain/facet/box/fvgridgeometry.hh
@@ -50,7 +50,7 @@ namespace Dumux {
 /*!
  * \ingroup FacetCoupling
  * \brief The default traits for the finite volume grid geometry
- *        of the box scheme with coupling occuring across the element facets.
+ *        of the box scheme with coupling occurring across the element facets.
  *        Defines the scv and scvf types and the mapper types.
  * \tparam the grid view type
  */
diff --git a/dumux/multidomain/facet/cellcentered/mpfa/interactionvolume.hh b/dumux/multidomain/facet/cellcentered/mpfa/interactionvolume.hh
index 3bdf195941..893eb345a9 100644
--- a/dumux/multidomain/facet/cellcentered/mpfa/interactionvolume.hh
+++ b/dumux/multidomain/facet/cellcentered/mpfa/interactionvolume.hh
@@ -224,7 +224,7 @@ public:
                 }
             }
 
-            // otherwise crate boundary scvf ...
+            // otherwise create boundary scvf ...
             else if (scvf.boundary())
             {
                 if (problem.boundaryTypes(element, scvf).hasOnlyDirichlet())
diff --git a/dumux/multidomain/facet/codimonegridadapter.hh b/dumux/multidomain/facet/codimonegridadapter.hh
index 559391d205..7a6804ccdf 100644
--- a/dumux/multidomain/facet/codimonegridadapter.hh
+++ b/dumux/multidomain/facet/codimonegridadapter.hh
@@ -43,7 +43,7 @@ namespace Dumux {
  *        can be used in the context of models where a sub-domain lives on the
  *        facets of a bulk grid.
  *
- * \tparam Embeddings Class containing the embedments of entites between grids of codim 1
+ * \tparam Embeddings Class containing the embedments of entities between grids of codim 1
  * \tparam bulkGridId The grid id of the d-dimensional grid within the hierarchy
  * \tparam facetGridId The grid id of the (d-1)-dimensional grid within the hierarchy
  */
@@ -139,7 +139,7 @@ public:
     /*!
      * \brief Returns the index within the d-dimensional grid of a vertex
      *        of the (d-1)-dimensional grid.
-     * \note  Leads to undefined behaviour if called for a vertex which doens't
+     * \note  Leads to undefined behaviour if called for a vertex which doesn't
      *        exist on the d-dimensional grid
      */
     BulkIndexType bulkGridVertexIndex(const FacetGridVertex& v) const
diff --git a/dumux/multidomain/facet/enrichmenthelper.hh b/dumux/multidomain/facet/enrichmenthelper.hh
index 40446fba71..57dfc20fa5 100644
--- a/dumux/multidomain/facet/enrichmenthelper.hh
+++ b/dumux/multidomain/facet/enrichmenthelper.hh
@@ -108,7 +108,7 @@ public:
                 if (!is.neighbor())
                     continue;
 
-                // if facet has been handled already, skip rest (necesary for e.g. Dune::FoamGrid)
+                // if facet has been handled already, skip rest (necessary for e.g. Dune::FoamGrid)
                 if (std::find(handledFacets.begin(), handledFacets.end(), is.indexInInside()) != handledFacets.end())
                     continue;
 
diff --git a/dumux/multidomain/facet/gmshreader.hh b/dumux/multidomain/facet/gmshreader.hh
index 4cddfe68c8..3ea42cb43f 100644
--- a/dumux/multidomain/facet/gmshreader.hh
+++ b/dumux/multidomain/facet/gmshreader.hh
@@ -55,7 +55,7 @@ namespace Dumux {
  *       then be interpreted as boundary segments. Use respective physical entity
  *       indexing in your grid file in that case.
  *
- * \tparam BulkGrid The type of the highest-dimensional grid in the hierachy
+ * \tparam BulkGrid The type of the highest-dimensional grid in the hierarchy
  * \tparam numGrids The number of grids to be considered in the hierarchy
  */
 template <class BulkGrid, int numGrids>
diff --git a/dumux/multidomain/facet/gridmanager.hh b/dumux/multidomain/facet/gridmanager.hh
index d0758da733..fcff5cd470 100644
--- a/dumux/multidomain/facet/gridmanager.hh
+++ b/dumux/multidomain/facet/gridmanager.hh
@@ -124,7 +124,7 @@ public:
     int getBoundaryDomainMarker(const typename Grid<id>::LeafGridView::Intersection& is) const
     { return std::get<id>(gridDataPtrTuple_)->getBoundaryDomainMarker(is); }
 
-    //! Returns the boundary marker for a given bounday segment index
+    //! Returns the boundary marker for a given boundary segment index
     template<std::size_t id>
     int getBoundaryDomainMarker(int boundarySegmentIndex) const
     { return std::get<id>(gridDataPtrTuple_)->getBoundaryDomainMarker(boundarySegmentIndex); }
diff --git a/dumux/multidomain/facet/vertexmapper.hh b/dumux/multidomain/facet/vertexmapper.hh
index 50e349644f..573cc721db 100644
--- a/dumux/multidomain/facet/vertexmapper.hh
+++ b/dumux/multidomain/facet/vertexmapper.hh
@@ -120,7 +120,7 @@ public:
                         vertexIndices[i] = codimOneGridAdapter.bulkGridVertexIndex( codimOneElement.template subEntity<dim-1>(vIdxLocal) );
                     }
 
-                    // if any of the vertices is on an immersed boudnary, we must not enrich any of them
+                    // if any of the vertices is on an immersed boundary, we must not enrich any of them
                     if (std::any_of(vertexIndices.begin(), vertexIndices.end(), [&isOnBoundary] (auto idx) { return !isOnBoundary[idx]; }))
                         std::for_each(vertexIndices.begin(), vertexIndices.end(), [&vertexMarkers] (auto idx) { vertexMarkers[idx] = false; });
                 }
diff --git a/dumux/multidomain/fvassembler.hh b/dumux/multidomain/fvassembler.hh
index 072288956f..7eb73b8423 100644
--- a/dumux/multidomain/fvassembler.hh
+++ b/dumux/multidomain/fvassembler.hh
@@ -561,7 +561,7 @@ private:
     /*!
      * \brief A method assembling something per element
      * \note Handles exceptions for parallel runs
-     * \throws NumericalProblem on all processes if something throwed during assembly
+     * \throws NumericalProblem on all processes if an exception is thrown during assembly
      * TODO: assemble in parallel
      */
     template<std::size_t i, class AssembleElementFunc>
@@ -604,7 +604,7 @@ private:
                                                         domainJ, gridGeometry(domainJ));
     }
 
-    // build periodic contraints into the system matrix
+    // build periodic constraints into the system matrix
     template<std::size_t i, class JacRow, class Sol, class GG>
     void enforcePeriodicConstraints_(Dune::index_constant<i> domainI, JacRow& jacRow, Sol& res, const GG& gridGeometry, const Sol& curSol)
     {
diff --git a/dumux/multidomain/fvgridgeometry.hh b/dumux/multidomain/fvgridgeometry.hh
index fa7f029d1e..62c85e7fcb 100644
--- a/dumux/multidomain/fvgridgeometry.hh
+++ b/dumux/multidomain/fvgridgeometry.hh
@@ -198,7 +198,7 @@ public:
 
 private:
 
-    //! a tuple of pointes to all grid variables
+    //! a tuple of points to all grid variables
     TupleType gridGeometries_;
 };
 
diff --git a/dumux/multidomain/fvgridvariables.hh b/dumux/multidomain/fvgridvariables.hh
index d481fca3eb..2e9345c59a 100644
--- a/dumux/multidomain/fvgridvariables.hh
+++ b/dumux/multidomain/fvgridvariables.hh
@@ -68,7 +68,7 @@ public:
     using TupleType = typename MDTraits::template Tuple<PtrType>;
 
     /*!
-     * \brief Contruct the grid variables
+     * \brief Construct the grid variables
      * \param gridGeometries a multidomain wrapper of a grid geometry tuple
      * \param problems a multidomain wrapper of a problem tuple
      */
@@ -179,7 +179,7 @@ public:
 
 private:
 
-    //! a tuple of pointes to all grid variables
+    //! a tuple of points to all grid variables
     TupleType gridVars_;
 };
 
diff --git a/dumux/multidomain/fvproblem.hh b/dumux/multidomain/fvproblem.hh
index 571955ddad..a608ac6097 100644
--- a/dumux/multidomain/fvproblem.hh
+++ b/dumux/multidomain/fvproblem.hh
@@ -63,7 +63,7 @@ public:
     using TupleType = typename MDTraits::template Tuple<PtrType>;
 
     /*!
-     * \brief Contruct the problem
+     * \brief Construct the problem
      * \param gridGeometries a tuple of grid geometry shared pointers
      */
     MultiDomainFVProblem(MultiDomainFVGridGeometry<MDTraits> gridGeometries)
@@ -131,7 +131,7 @@ public:
 
 private:
 
-    //! a tuple of pointes to all grid variables
+    //! a tuple of points to all grid variables
     TupleType problems_;
 };
 
diff --git a/dumux/multidomain/io/vtkoutputmodule.hh b/dumux/multidomain/io/vtkoutputmodule.hh
index 9a2fb3960f..60992d430a 100644
--- a/dumux/multidomain/io/vtkoutputmodule.hh
+++ b/dumux/multidomain/io/vtkoutputmodule.hh
@@ -40,7 +40,7 @@ namespace Dumux {
  * \ingroup MultiDomain
  * \brief A multidomain wrapper for multiple vtk output modules
  * \tparam MDTraits The multidomain traits
- * \tparam Module An output module class template that takes GridVariables and SolutionVector as arugments
+ * \tparam Module An output module class template that takes GridVariables and SolutionVector as arguments
  */
 template<class MDTraits, template<class GV, class S> class Module = Dumux::VtkOutputModule>
 class MultiDomainVtkOutputModule
@@ -76,7 +76,7 @@ public:
     MultiDomainVtkOutputModule() = default;
 
     /*!
-     * \brief Contruct the vtk output modules
+     * \brief Construct the vtk output modules
      * \param gridVars a tuple of grid variables
      * \param sol the multidomain solution vector
      * \param name the base name for the vtk output
@@ -135,7 +135,7 @@ public:
 
 private:
 
-    //! a tuple of pointes to all vtk output modules
+    //! a tuple of points to all vtk output modules
     typename MDTraits::template Tuple<PtrType> vtkOutputModule_;
 };
 
diff --git a/dumux/multidomain/newtonsolver.hh b/dumux/multidomain/newtonsolver.hh
index 7f2f93da0b..24672b2045 100644
--- a/dumux/multidomain/newtonsolver.hh
+++ b/dumux/multidomain/newtonsolver.hh
@@ -42,7 +42,7 @@ using GetPVSwitchMultiDomain = Dune::Std::detected_or<int, DetectPVSwitchMultiDo
 /*!
  * \ingroup Nonlinear
  * \ingroup MultiDomain
- * \brief Newton sover for coupled problems
+ * \brief Newton solver for coupled problems
  */
 template <class Assembler, class LinearSolver, class CouplingManager,
           class Reassembler = DefaultPartialReassembler,
diff --git a/dumux/multidomain/staggeredcouplingmanager.hh b/dumux/multidomain/staggeredcouplingmanager.hh
index e9098c13e8..2bdb97db59 100644
--- a/dumux/multidomain/staggeredcouplingmanager.hh
+++ b/dumux/multidomain/staggeredcouplingmanager.hh
@@ -119,7 +119,7 @@ public:
         static_assert(AlwaysFalse<Dune::index_constant<i>>::value,
                       "The coupling manager does not implement the couplingStencil() function" );
 
-        return CouplingStencil(); // supress compiler warning of function having no return statement
+        return CouplingStencil(); // suppress compiler warning of function having no return statement
     }
 
     /*!
@@ -221,7 +221,7 @@ public:
                         "  Face.Assembly.NumericDifference.PriVarMagnitude = mFace\n"
                         "  CellCenter.Assembly.NumericDifference.BaseEpsilon = eCC_0 ... eCC_numEqCellCenter-1\n"
                         "  Face.Assembly.NumericDifference.BaseEpsilon = eFace_0 ... eFace_numEqFace-1\n\n"
-                        "Wrong numer of values set for " << prefix  << " (has " << numEq << " primary variable(s))\n\n" << e);
+                        "Wrong number of values set for " << prefix  << " (has " << numEq << " primary variable(s))\n\n" << e);
         }
 
     }
diff --git a/dumux/multidomain/staggeredfreeflow/couplingmanager.hh b/dumux/multidomain/staggeredfreeflow/couplingmanager.hh
index c8645d0047..627ecbd27d 100644
--- a/dumux/multidomain/staggeredfreeflow/couplingmanager.hh
+++ b/dumux/multidomain/staggeredfreeflow/couplingmanager.hh
@@ -429,7 +429,7 @@ public:
      *       the primary variables at the degree of freedom location with index dofIdxGlobalJ
      * \note  the element whose residual is to be evaluated can be retrieved from the local assembler
      *        as localAssemblerI.element()
-     * \note  per default, we udpate the solution vector, if the element residual of domain i depends on more than
+     * \note  per default, we update the solution vector, if the element residual of domain i depends on more than
      *        the primary variables of domain j update the other dependent data here by overloading this function
      */
     template<std::size_t i, std::size_t j, class LocalAssemblerI>
diff --git a/dumux/multidomain/staggeredtraits.hh b/dumux/multidomain/staggeredtraits.hh
index 6305b90e17..7fadd78490 100644
--- a/dumux/multidomain/staggeredtraits.hh
+++ b/dumux/multidomain/staggeredtraits.hh
@@ -219,7 +219,7 @@ public:
     //\}
 
     /*
-     * \brief helper aliases to contruct derived tuple types
+     * \brief helper aliases to construct derived tuple types
      */
     //\{
 
diff --git a/dumux/multidomain/subdomainboxlocalassembler.hh b/dumux/multidomain/subdomainboxlocalassembler.hh
index 605e1e242a..63b7b4c460 100644
--- a/dumux/multidomain/subdomainboxlocalassembler.hh
+++ b/dumux/multidomain/subdomainboxlocalassembler.hh
@@ -415,7 +415,7 @@ public:
         // actual element. In the actual element we evaluate the derivative of the entire residual.     //
         //////////////////////////////////////////////////////////////////////////////////////////////////
 
-        // get the vecor of the acutal element residuals
+        // get the vecor of the actual element residuals
         const auto origResiduals = this->evalLocalResidual();
 
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -506,7 +506,7 @@ public:
         auto&& curElemVolVars = this->curElemVolVars();
         auto&& elemFluxVarsCache = this->elemFluxVarsCache();
 
-        // get element stencil informations
+        // get element stencil information
         const auto& stencil = this->couplingManager().couplingStencil(domainI, element, domainJ);
 
         // convenience lambda for call to update self
diff --git a/dumux/multidomain/subdomaincclocalassembler.hh b/dumux/multidomain/subdomaincclocalassembler.hh
index 9eecd10d2d..61be763a12 100644
--- a/dumux/multidomain/subdomaincclocalassembler.hh
+++ b/dumux/multidomain/subdomaincclocalassembler.hh
@@ -337,7 +337,7 @@ public:
         auto&& curElemVolVars = this->curElemVolVars();
         auto&& elemFluxVarsCache = this->elemFluxVarsCache();
 
-        // get stencil informations
+        // get stencil information
         const auto globalI = gridGeometry.elementMapper().index(element);
         const auto& connectivityMap = gridGeometry.connectivityMap();
         const auto numNeighbors = connectivityMap[globalI].size();
@@ -387,7 +387,7 @@ public:
         // element solution container to be deflected
         auto elemSol = elementSolution<FVElementGeometry>(origPriVars);
 
-        // derivatives in the neighbors with repect to the current elements
+        // derivatives in the neighbors with respect to the current elements
         // in index 0 we save the derivative of the element residual with respect to it's own dofs
         Residuals partialDerivs(numNeighbors + 1);
 
@@ -426,7 +426,7 @@ public:
 
             // Correct derivative for ghost elements, i.e. set a 1 for the derivative w.r.t. the
             // current primary variable and a 0 elsewhere. As we always solve for a delta of the
-            // solution with repect to the initial one, this results in a delta of 0 for ghosts.
+            // solution with respect to the initial one, this results in a delta of 0 for ghosts.
             if (this->elementIsGhost())
             {
                 partialDerivs[0] = 0.0;
@@ -530,7 +530,7 @@ public:
         auto&& curElemVolVars = this->curElemVolVars();
         auto&& elemFluxVarsCache = this->elemFluxVarsCache();
 
-        // get stencil informations
+        // get stencil information
         const auto globalI = gridGeometry.elementMapper().index(element);
         const auto& stencil = this->couplingManager().couplingStencil(domainI, element, domainJ);
         const auto& curSolJ = this->curSol()[domainJ];
@@ -704,7 +704,7 @@ public:
         // element solution container to be deflected
         auto elemSol = elementSolution(element, curSol, gridGeometry);
 
-        // derivatives in the neighbors with repect to the current elements
+        // derivatives in the neighbors with respect to the current elements
         LocalResidualValues partialDeriv;
         for (int pvIdx = 0; pvIdx < numEq; ++pvIdx)
         {
@@ -730,7 +730,7 @@ public:
             }
 
             // for ghost elements we assemble a 1.0 where the primary variable and zero everywhere else
-            // as we always solve for a delta of the solution with repect to the initial solution this
+            // as we always solve for a delta of the solution with respect to the initial solution this
             // results in a delta of zero for ghosts
             else partialDeriv[pvIdx] = 1.0;
 
@@ -922,7 +922,7 @@ public:
         auto&& curElemVolVars = this->curElemVolVars();
         // auto&& elemFluxVarsCache = this->elemFluxVarsCache();
 
-        // get stencil informations
+        // get stencil information
         const auto globalI = gridGeometry.elementMapper().index(element);
         const auto& stencil = this->couplingManager().couplingStencil(domainI, element, domainJ);
 
diff --git a/dumux/multidomain/subdomainstaggeredlocalassembler.hh b/dumux/multidomain/subdomainstaggeredlocalassembler.hh
index 72d5161033..6676d7c82f 100644
--- a/dumux/multidomain/subdomainstaggeredlocalassembler.hh
+++ b/dumux/multidomain/subdomainstaggeredlocalassembler.hh
@@ -365,7 +365,7 @@ private:
         });
     }
 
-    //! If specified in the problem, a fixed Dirichlet value can be assigned to cell centered unknows such as pressure
+    //! If specified in the problem, a fixed Dirichlet value can be assigned to cell centered unknowns such as pressure
     template<class JacobianMatrixRow>
     void incorporateDirichletCells_(JacobianMatrixRow& jacRow)
     {
@@ -789,7 +789,7 @@ public:
         // get some aliases for convenience
         const auto& element = this->element();
 
-        // get stencil informations
+        // get stencil information
         const auto& stencil = this->couplingManager().couplingStencil(domainI, element, domainJ);
 
         if (stencil.empty())
@@ -928,7 +928,7 @@ public:
             // set the actual dof index
             const auto faceGlobalI = scvf.dofIndex();
 
-            // get stencil informations
+            // get stencil information
             const auto& stencil = this->couplingManager().couplingStencil(domainI, scvf, domainJ);
 
             if (stencil.empty())
diff --git a/dumux/multidomain/traits.hh b/dumux/multidomain/traits.hh
index 22f2552456..5c562ffa97 100644
--- a/dumux/multidomain/traits.hh
+++ b/dumux/multidomain/traits.hh
@@ -202,7 +202,7 @@ public:
     //\}
 
     /*
-     * \brief helper aliases to contruct derived tuple types
+     * \brief helper aliases to construct derived tuple types
      */
     //\{
 
diff --git a/dumux/porenetwork/1p/model.hh b/dumux/porenetwork/1p/model.hh
index 0ea2d97c14..debd6b989e 100644
--- a/dumux/porenetwork/1p/model.hh
+++ b/dumux/porenetwork/1p/model.hh
@@ -174,6 +174,6 @@ struct ModelTraits<TypeTag, TTag::PNMOnePNI> { using type = PorousMediumFlowNIMo
 template<class TypeTag>
 struct ThermalConductivityModel<TypeTag, TTag::PNMOnePNI> { using type = ThermalConductivityAverage<GetPropType<TypeTag, Properties::Scalar>>; };
 
-} // end namespace Dumux::Properies
+} // end namespace Dumux::Properties
 
 #endif
diff --git a/dumux/porenetwork/2p/invasionstate.hh b/dumux/porenetwork/2p/invasionstate.hh
index 643ac55d5e..21b5c77ef5 100644
--- a/dumux/porenetwork/2p/invasionstate.hh
+++ b/dumux/porenetwork/2p/invasionstate.hh
@@ -107,7 +107,7 @@ public:
 
             for (auto&& scvf : scvfs(fvGeometry))
             {
-                // checks if invasion or snap-off occured after Newton iteration step
+                // checks if invasion or snap-off occurred after Newton iteration step
                 if (const auto invasionResult = invasionSwitch_(element, elemVolVars, elemFluxVarsCache[scvf]); invasionResult)
                 {
                     hasChangedInCurrentIteration_ = true;
@@ -269,7 +269,7 @@ private:
                 }
                 else
                 {
-                    std::cout << "Snap-off occured at throat " << eIdx << " from pore "  << vIdx << " :";
+                    std::cout << "Snap-off occurred at throat " << eIdx << " from pore "  << vIdx << " :";
                     std::cout << " pc: " << *pcMax;
                     std::cout << ", pcSnapoff: " << spatialParams.pcSnapoff(element, elemVolVars);
                     std::cout << ", sw: " << sw[result.localScvIdxWithCriticalPc] << std::endl;
diff --git a/dumux/porenetwork/2p/newtonconsistencychecks.hh b/dumux/porenetwork/2p/newtonconsistencychecks.hh
index 5a161335fa..d72d44f6e5 100644
--- a/dumux/porenetwork/2p/newtonconsistencychecks.hh
+++ b/dumux/porenetwork/2p/newtonconsistencychecks.hh
@@ -83,7 +83,7 @@ public:
     }
 
     /*!
-     * \brief Checks if the relative shift of saturation  between to consecutive time steps is below a given treshold.
+     * \brief Checks if the relative shift of saturation  between to consecutive time steps is below a given threshold.
      */
     void checkRelativeSaturationShift(const GridVariables& gridVariables, const SolutionVector& uCurrentIter, const SolutionVector& prevSol) const
     {
diff --git a/dumux/porenetwork/common/boundaryflux.hh b/dumux/porenetwork/common/boundaryflux.hh
index 0187f7fa56..780c7bcc5b 100644
--- a/dumux/porenetwork/common/boundaryflux.hh
+++ b/dumux/porenetwork/common/boundaryflux.hh
@@ -235,7 +235,7 @@ private:
                 NumEqVector flux(0.0);
                 for (int eqIdx = 0; eqIdx < NumEqVector::dimension; ++eqIdx)
                 {
-                    // Check the type of the boudary condition.
+                    // Check the type of the boundary condition.
                     // If BC is Dirichlet type, the flux is equal to the local residual of the element's scv on the boundary.
                     // Otherwise the flux is either zero or equal to a source term at the element's scv on the boundary.
                     // Technicaly, the PNM considers source terms instead of Neumann BCs.
@@ -249,7 +249,7 @@ private:
                         flux[eqIdx] = residual[scv.indexInElement()][eqIdx];
                 }
 
-                // The flux must be substracted:
+                // The flux must be subtracted:
                 // On an inlet boundary, the flux part of the local residual will be positive, since all fluxes will leave the SCV towards to interior domain.
                 // For the domain itself, however, the sign has to be negative, since mass is entering the system.
                 boundaryFluxes_[scv.dofIndex()] -= flux;
diff --git a/dumux/porenetwork/common/throatproperties.hh b/dumux/porenetwork/common/throatproperties.hh
index 534c37a07b..519f51caa0 100644
--- a/dumux/porenetwork/common/throatproperties.hh
+++ b/dumux/porenetwork/common/throatproperties.hh
@@ -118,7 +118,7 @@ inline Dune::ReservedVector<Scalar, 4> cornerHalfAngles(Shape shape)
             return Dune::ReservedVector<Scalar, 4>{};
         }
         case Shape::polygon: DUNE_THROW(Dune::InvalidStateException, "Corner half angles for polygons must be calculated explicitly");
-        default: DUNE_THROW(Dune::InvalidStateException, "Unkown shape");
+        default: DUNE_THROW(Dune::InvalidStateException, "Unknown shape");
         // TODO implement angles for scaleneTriangle as given by Valvatne & Blunt (2004)
     }
 }
@@ -167,7 +167,7 @@ inline Scalar shapeFactor(Shape shape, const Scalar inscribedRadius)
         case Shape::circle: return shapeFactorCircle<Scalar>();
         case Shape::twoPlates: return 0.0; // TODO is this a good idea?
         case Shape::polygon: DUNE_THROW(Dune::InvalidStateException, "The shape factor for a polygon has to be defined by the input data");
-        default: DUNE_THROW(Dune::InvalidStateException, "Unkown shape");
+        default: DUNE_THROW(Dune::InvalidStateException, "Unknown shape");
     }
 }
 
diff --git a/dumux/porousmediumflow/2p/gridadaptindicator.hh b/dumux/porousmediumflow/2p/gridadaptindicator.hh
index 098498e6f9..afd019bd8d 100644
--- a/dumux/porousmediumflow/2p/gridadaptindicator.hh
+++ b/dumux/porousmediumflow/2p/gridadaptindicator.hh
@@ -93,7 +93,7 @@ public:
     }
 
     /*!
-     * \brief Function to set the minumum/maximum allowed levels.
+     * \brief Function to set the minimum/maximum allowed levels.
      *
      * \param minLevel The minimum level
      * \param maxLevel The maximum level
diff --git a/dumux/porousmediumflow/2p/griddatatransfer.hh b/dumux/porousmediumflow/2p/griddatatransfer.hh
index 7dc206f8d1..38ec15039d 100644
--- a/dumux/porousmediumflow/2p/griddatatransfer.hh
+++ b/dumux/porousmediumflow/2p/griddatatransfer.hh
@@ -346,7 +346,7 @@ public:
                                                                         adaptedValuesFather.u,
                                                                         scv.dofPosition());
 
-                    // compute mass & mass coeffients for the scvs (saturations are recalculated at the end)
+                    // compute mass & mass coefficients for the scvs (saturations are recalculated at the end)
                     const auto fatherElementVolume = Extrusion::volume(fatherGeometry);
                     for (const auto& scv : scvs(fvGeometry))
                     {
diff --git a/dumux/porousmediumflow/3p3c/model.hh b/dumux/porousmediumflow/3p3c/model.hh
index 28a4cacecb..b4d36cfa3f 100644
--- a/dumux/porousmediumflow/3p3c/model.hh
+++ b/dumux/porousmediumflow/3p3c/model.hh
@@ -95,7 +95,7 @@ namespace Dumux {
 /*!
  * \ingroup ThreePThreeCModel
  * \brief Specifies a number properties of two-phase models.
- * \param useCS if we are using the contraint solver
+ * \param useCS if we are using the constraint solver
  */
 template<bool useCS, bool useMol>
 struct ThreePThreeCModelTraits
diff --git a/dumux/porousmediumflow/3p3c/volumevariables.hh b/dumux/porousmediumflow/3p3c/volumevariables.hh
index 036e494c1c..4e75d28a16 100644
--- a/dumux/porousmediumflow/3p3c/volumevariables.hh
+++ b/dumux/porousmediumflow/3p3c/volumevariables.hh
@@ -560,7 +560,7 @@ public:
         /* compute the diffusion coefficient
          * \note This is the part of the diffusion coefficient determined by the fluid state, e.g.
          *       important if they are tabularized. In the diffusive flux computation (e.g. Fick's law)
-         *       this gets converted into an effecient coefficient depending on saturation and porosity.
+         *       this gets converted into an efficient coefficient depending on saturation and porosity.
          *       We can then add a normalized tensorial component
          *       e.g. obtained from DTI from the spatial params (currently not implemented)
          */
diff --git a/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh b/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh
index c3da60dac1..69c9562217 100644
--- a/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh
+++ b/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh
@@ -344,7 +344,7 @@ private:
         using LocalIndexType = typename SubControlVolumeFace::Traits::LocalIndexType;
         for (LocalIndexType scvLocalIdx = 0; scvLocalIdx < elementGeometry.corners(); ++scvLocalIdx)
         {
-            // get asssociated dof index
+            // get associated dof index
             const auto dofIdxGlobal = gridGeometry().vertexMapper().subIndex(element, scvLocalIdx, dim);
 
             // add scv to the local container
diff --git a/dumux/porousmediumflow/boxdfm/vtkoutputmodule.hh b/dumux/porousmediumflow/boxdfm/vtkoutputmodule.hh
index a7efead19c..f59805531c 100644
--- a/dumux/porousmediumflow/boxdfm/vtkoutputmodule.hh
+++ b/dumux/porousmediumflow/boxdfm/vtkoutputmodule.hh
@@ -134,7 +134,7 @@ private:
         //! (1) Assemble all variable fields and add to writer
         //////////////////////////////////////////////////////////////
 
-        // instatiate the velocity output
+        // instantiate the velocity output
         std::vector<typename ParentType::VelocityOutput::VelocityVector> velocity;
 
         // process rank
@@ -306,7 +306,7 @@ private:
         //! (1) Assemble all variable fields and add to writer
         //////////////////////////////////////////////////////////////
 
-        // instatiate the velocity output
+        // instantiate the velocity output
         std::vector<typename ParentType::VelocityOutput::VelocityVector> velocity;
 
         // process rank
diff --git a/dumux/porousmediumflow/co2/model.hh b/dumux/porousmediumflow/co2/model.hh
index 79be63bace..be43162fd2 100644
--- a/dumux/porousmediumflow/co2/model.hh
+++ b/dumux/porousmediumflow/co2/model.hh
@@ -34,7 +34,7 @@
  * \ingroup CO2Model
  * \brief Adaption of the non-isothermal two-phase two-component flow model to problems with CO2
  *
- *  TODO: Put a doxgyen link refernce here
+ *  TODO: Put a doxgyen link reference here
  *  See TwoPTwoCModel for reference to the equations used.
  *  The CO2 model is derived from the 2p2c model. In the CO2 model the phase switch criterion
  *  is different from the 2p2c model.
diff --git a/dumux/porousmediumflow/compositional/localresidual.hh b/dumux/porousmediumflow/compositional/localresidual.hh
index a7197427d1..ffacc95348 100644
--- a/dumux/porousmediumflow/compositional/localresidual.hh
+++ b/dumux/porousmediumflow/compositional/localresidual.hh
@@ -137,7 +137,7 @@ public:
      * \param fvGeometry The finite-volume geometry
      * \param elemVolVars The volume variables of the current element
      * \param scvf The sub control volume face to compute the flux on
-     * \param elemFluxVarsCache The cache related to flux compuation
+     * \param elemFluxVarsCache The cache related to flux computation
      */
     NumEqVector computeFlux(const Problem& problem,
                             const Element& element,
@@ -249,7 +249,7 @@ protected:
     { return static_cast<const Implementation *> (this); }
 
     template <class T = ModelTraits>
-    [[deprecated("All compositional models must specifiy if dispersion is enabled."
+    [[deprecated("All compositional models must specify if dispersion is enabled."
                  "Please add enableCompositionalDispersion to the ModelTraits in your model header.")]]
     void enableCompositionalDispersionMissing_() const {}
 };
diff --git a/dumux/porousmediumflow/fluxvariablescachefiller.hh b/dumux/porousmediumflow/fluxvariablescachefiller.hh
index d7b4d57df5..1ec42a8d13 100644
--- a/dumux/porousmediumflow/fluxvariablescachefiller.hh
+++ b/dumux/porousmediumflow/fluxvariablescachefiller.hh
@@ -366,7 +366,7 @@ private:
         static constexpr bool isSecondary = MpfaHelper::considerSecondaryIVs()
                                             && std::is_same_v<InteractionVolume, SecondaryInteractionVolume>;
 
-        // First we upate data which are not dependent on the physical processes.
+        // First we update data which are not dependent on the physical processes.
         // We store pointers to the other flux var caches, so that we have to obtain
         // this data only once and can use it again in the sub-cache fillers.
         const auto numGlobalScvfs = iv.localFaceData().size();
@@ -414,7 +414,7 @@ private:
             // ifs are evaluated at compile time and are optimized away
             if (std::is_same_v<PrimaryInteractionVolume, SecondaryInteractionVolume>)
             {
-                // we cannot make a disctinction, thus we set both pointers
+                // we cannot make a distinction, thus we set both pointers
                 primaryLocalFaceData_ = &(iv.localFaceData()[i]);
                 secondaryLocalFaceData_ = &(iv.localFaceData()[i]);
             }
@@ -462,7 +462,7 @@ private:
                     // ifs are evaluated at compile time and are optimized away
                     if constexpr (std::is_same_v<PrimaryInteractionVolume, SecondaryInteractionVolume>)
                     {
-                        // we cannot make a disctinction, thus we set both pointers
+                        // we cannot make a distinction, thus we set both pointers
                         primaryLocalFaceData_ = &(iv.localFaceData()[i]);
                         secondaryLocalFaceData_ = &(iv.localFaceData()[i]);
                     }
@@ -502,7 +502,7 @@ private:
             // ifs are evaluated at compile time and are optimized away
             if constexpr (std::is_same_v<PrimaryInteractionVolume, SecondaryInteractionVolume>)
             {
-                // we cannot make a disctinction, thus we set both pointers
+                // we cannot make a distinction, thus we set both pointers
                 primaryLocalFaceData_ = &(iv.localFaceData()[i]);
                 secondaryLocalFaceData_ = &(iv.localFaceData()[i]);
             }
diff --git a/dumux/porousmediumflow/mineralization/model.hh b/dumux/porousmediumflow/mineralization/model.hh
index bccfc1a369..e5ec1215b6 100644
--- a/dumux/porousmediumflow/mineralization/model.hh
+++ b/dumux/porousmediumflow/mineralization/model.hh
@@ -38,7 +38,7 @@ namespace Dumux {
 /*!
  * \ingroup MineralizationModel
  * \brief Specifies a number properties of
- *        models that consider mineralization proceses.
+ *        models that consider mineralization processes.
  *
  * \Å£param NonMinTraits traits class of the underlying model
  *                      not considering mineralization.
diff --git a/dumux/porousmediumflow/nonequilibrium/localresidual.hh b/dumux/porousmediumflow/nonequilibrium/localresidual.hh
index 6029dbe392..0c3993eb65 100644
--- a/dumux/porousmediumflow/nonequilibrium/localresidual.hh
+++ b/dumux/porousmediumflow/nonequilibrium/localresidual.hh
@@ -86,7 +86,7 @@ public:
         source += problem.scvPointSources(element, fvGeometry, elemVolVars, scv);
 
         // Call the (kinetic) Energy module, for the source term.
-        // it has to be called from here, because the mass transfered has to be known.
+        // it has to be called from here, because the mass transferred has to be known.
         if constexpr(ModelTraits::enableThermalNonEquilibrium())
         {
             EnergyLocalResidual::computeSourceEnergy(source,
@@ -184,7 +184,7 @@ public:
      * \param fvGeometry The finite-volume geometry
      * \param elemVolVars The volume variables of the current element
      * \param scvf The sub control volume face to compute the flux on
-     * \param elemFluxVarsCache The cache related to flux compuation
+     * \param elemFluxVarsCache The cache related to flux computation
      */
     NumEqVector computeFlux(const Problem& problem,
                             const Element& element,
@@ -305,7 +305,7 @@ public:
         if constexpr (ModelTraits::enableThermalNonEquilibrium())
         {
             // Call the (kinetic) Energy module, for the source term.
-            // it has to be called from here, because the mass transfered has to be known.
+            // it has to be called from here, because the mass transferred has to be known.
             EnergyLocalResidual::computeSourceEnergy(source,
                                                      element,
                                                      fvGeometry,
diff --git a/dumux/porousmediumflow/nonisothermal/localresidual.hh b/dumux/porousmediumflow/nonisothermal/localresidual.hh
index 309212a805..0e31253e84 100644
--- a/dumux/porousmediumflow/nonisothermal/localresidual.hh
+++ b/dumux/porousmediumflow/nonisothermal/localresidual.hh
@@ -242,7 +242,7 @@ public:
 private:
 
     template <class T = ModelTraits>
-    [[deprecated("All non-isothermal models must specifiy if thermal dispersion is enabled."
+    [[deprecated("All non-isothermal models must specify if thermal dispersion is enabled."
                  "Please add enableThermalDispersion to the ModelTraits in your model header.")]]
     static void enableThermalDispersionMissing_() {}
 
diff --git a/dumux/porousmediumflow/richards/localresidual.hh b/dumux/porousmediumflow/richards/localresidual.hh
index a77392cd1c..218c06a5be 100644
--- a/dumux/porousmediumflow/richards/localresidual.hh
+++ b/dumux/porousmediumflow/richards/localresidual.hh
@@ -147,7 +147,7 @@ public:
      * \param fvGeometry The finite-volume geometry
      * \param elemVolVars The volume variables of the current element
      * \param scvf The sub control volume face to compute the flux on
-     * \param elemFluxVarsCache The cache related to flux compuation
+     * \param elemFluxVarsCache The cache related to flux computation
      */
     NumEqVector computeFlux(const Problem& problem,
                             const Element& element,
diff --git a/dumux/porousmediumflow/richards/volumevariables.hh b/dumux/porousmediumflow/richards/volumevariables.hh
index 5ad08e9d9e..897795e48e 100644
--- a/dumux/porousmediumflow/richards/volumevariables.hh
+++ b/dumux/porousmediumflow/richards/volumevariables.hh
@@ -431,7 +431,7 @@ public:
      * \brief Returns the water content of a fluid phase within the finite volume.
      *
      * The water content is defined as the fraction of
-     * the saturation devided by the porosity.
+     * the saturation divided by the porosity.
 
      * \param phaseIdx The index of the fluid phase
      * \note this function is here as a convenience to the user to not have to
diff --git a/dumux/porousmediumflow/richardsnc/volumevariables.hh b/dumux/porousmediumflow/richardsnc/volumevariables.hh
index 5593194745..67c546e90e 100644
--- a/dumux/porousmediumflow/richardsnc/volumevariables.hh
+++ b/dumux/porousmediumflow/richardsnc/volumevariables.hh
@@ -68,7 +68,7 @@ public:
     using SolidSystem = typename Traits::SolidSystem;
     //! Export indices
     using Indices = typename Traits::ModelTraits::Indices;
-    //! Export phase acess indices
+    //! Export phase access indices
     static constexpr int liquidPhaseIdx = 0;
     static constexpr int gasPhaseIdx = 1;
 
@@ -344,7 +344,7 @@ public:
      *        fluid phase within the finite volume.
      *
      * The water content is defined as the fraction of
-     * the saturation devided by the porosity
+     * the saturation divided by the porosity
 
      * \param phaseIdx The index of the fluid phase
      * \note this function is here as a convenience to the user to not have to
@@ -419,7 +419,7 @@ private:
 
     Scalar relativePermeabilityWetting_; // the relative permeability of the wetting phase
     SolidState solidState_;
-    PermeabilityType permeability_; // the instrinsic permeability
+    PermeabilityType permeability_; // the intrinsic permeability
     Scalar pn_; // the reference nonwetting pressure
     Scalar minPc_; // the minimum capillary pressure (entry pressure)
 };
diff --git a/dumux/porousmediumflow/solidenergy/localresidual.hh b/dumux/porousmediumflow/solidenergy/localresidual.hh
index 2ec74f6573..b53137069d 100644
--- a/dumux/porousmediumflow/solidenergy/localresidual.hh
+++ b/dumux/porousmediumflow/solidenergy/localresidual.hh
@@ -84,7 +84,7 @@ public:
      * \param fvGeometry The finite volume geometry context
      * \param elemVolVars The volume variables for all flux stencil elements
      * \param scvf The sub control volume face to compute the flux on
-     * \param elemFluxVarsCache The cache related to flux compuation
+     * \param elemFluxVarsCache The cache related to flux computation
      */
     NumEqVector computeFlux(const Problem& problem,
                             const Element& element,
diff --git a/dumux/porousmediumflow/tracer/localresidual.hh b/dumux/porousmediumflow/tracer/localresidual.hh
index 289c3a6b48..c08c17bf9b 100644
--- a/dumux/porousmediumflow/tracer/localresidual.hh
+++ b/dumux/porousmediumflow/tracer/localresidual.hh
@@ -80,7 +80,7 @@ public:
      *
      * \param problem The problem
      * \param scv The sub control volume
-     * \param volVars The primary and secondary varaibles on the scv
+     * \param volVars The primary and secondary variables on the scv
      */
     NumEqVector computeStorage(const Problem& problem,
                                const SubControlVolume& scv,
@@ -125,7 +125,7 @@ public:
      * \param fvGeometry The finite volume geometry context
      * \param elemVolVars The volume variables for all flux stencil elements
      * \param scvf The sub control volume face
-     * \param elemFluxVarsCache The cache related to flux compuation
+     * \param elemFluxVarsCache The cache related to flux computation
      */
     NumEqVector computeFlux(const Problem& problem,
                             const Element& element,
@@ -409,7 +409,7 @@ public:
 
 private:
     template <class T = ModelTraits>
-    [[deprecated("All compositional models must specifiy if dispersion is enabled."
+    [[deprecated("All compositional models must specify if dispersion is enabled."
                  "Please add enableCompositionalDispersion to the ModelTraits in your model header.")]]
     void enableCompositionalDispersionMissing_() const {}
 };
diff --git a/dumux/python/common/fvspatialparams.hh b/dumux/python/common/fvspatialparams.hh
index 9b69fe339b..de7ef98886 100644
--- a/dumux/python/common/fvspatialparams.hh
+++ b/dumux/python/common/fvspatialparams.hh
@@ -128,7 +128,7 @@ public:
      * \f$\boldsymbol{g} = ( 0,\dots,\ -9.81)^T \f$,
      * else \f$\boldsymbol{g} = ( 0,\dots, 0)^T \f$.
      *
-     * \param pos the spatial position at which to evaulate the gravity vector
+     * \param pos the spatial position at which to evaluate the gravity vector
      */
     const GravityVector& gravity(const GlobalPosition& pos) const
     { return gravity_; }
diff --git a/examples/1ptracer/doc/1p.md b/examples/1ptracer/doc/1p.md
index 02704ced7b..a996628c72 100644
--- a/examples/1ptracer/doc/1p.md
+++ b/examples/1ptracer/doc/1p.md
@@ -86,7 +86,7 @@ This way, most of the `properties` required for single-phase flow simulations
 using the cell centered finite volume scheme with two-point-flux approximation
 are conveniently specialized for our new type tag.
 However, some properties depend on user choices and no meaningful default value can be set.
-Those properties will be adressed later in this file.
+Those properties will be addressed later in this file.
 
 ```cpp
 // We enter the namespace Dumux::Properties in order to import the entire Dumux namespace for general use:
@@ -155,7 +155,7 @@ Apart from that, we also set some properties related to memory management
 throughout the simulation.
 <details><summary> Click to show caching properties</summary>
 
-In Dumux, one has the option to activate/deactive the grid-wide caching of
+In Dumux, one has the option to activate/deactivate the grid-wide caching of
 geometries and variables. If active, the CPU time can be significantly reduced
 as less dynamic memory allocation procedures are necessary. Per default, grid-wide
 caching is disabled to ensure minimal memory requirements, however, in this example we
@@ -367,7 +367,7 @@ public:
 #### Generation of the random permeability field
 We generate a random permeability field upon construction of the spatial parameters class
 using lognormal distributions. The mean values for the permeability inside and outside of a
-low-permeable lens (given by the coorinates `lensLowerLeft_` and `lensUpperRight_`) are defined
+low-permeable lens (given by the coordinates `lensLowerLeft_` and `lensUpperRight_`) are defined
 in the variables  `permeabilityLens_` and `permeability_`. The respective values are obtained
 from the input file making use of the free function `getParam`. We use a standard deviarion
 of 10% here and compute permeabily values for all elements of the computational grid.
@@ -427,7 +427,7 @@ Note that in case you want to use solution-dependent porosities, you can
 use the overload
 `porosity(const Element&, const SubControlVolume&, const ElementSolution&)`
 that is defined in the base class `FVPorousMediumFlowSpatialParamsOneP`. Per default, this
-fowards to the `porosityAtPos` function per default, which we overload here.
+forwards to the `porosityAtPos` function per default, which we overload here.
 
 ```cpp
     Scalar porosityAtPos(const GlobalPosition& globalPos) const
diff --git a/examples/1ptracer/doc/main.md b/examples/1ptracer/doc/main.md
index 986760dad8..a011f31d69 100644
--- a/examples/1ptracer/doc/main.md
+++ b/examples/1ptracer/doc/main.md
@@ -209,7 +209,7 @@ problem defined in `problem_1p.hh`. Let us now write this solution to a VTK file
 We use the results of the 1p problem to calculate the volume fluxes across all sub-control volume
 faces of the discretization and store them in the vector `volumeFlux`. In order to do so, we iterate
 over all elements of the grid, and in each element compute the volume fluxes for all sub-control volume
-faces embeded in that element.
+faces embedded in that element.
 
 ```cpp
     using Scalar =  GetPropType<OnePTypeTag, Properties::Scalar>; // type for scalar values
diff --git a/examples/1ptracer/doc/tracer.md b/examples/1ptracer/doc/tracer.md
index f84f006438..a69f7f5732 100644
--- a/examples/1ptracer/doc/tracer.md
+++ b/examples/1ptracer/doc/tracer.md
@@ -135,7 +135,7 @@ This way, most of the properties required for tracer transport simulations using
 the cell centered finite volume scheme with two-point-flux approximation are
 conveniently specialized for our new type tag.
 However, some properties depend on user choices and no meaningful default value
-can be set. Those properties will be adressed later in this file.
+can be set. Those properties will be addressed later in this file.
 
 ```cpp
 namespace Properties {
@@ -193,7 +193,7 @@ Moreover, we specialize several properties related to efficiency optimizations
 <details><summary> Click to show caching properties</summary>
 
 ```cpp
-// In Dumux, one has the option to activate/deactive the grid-wide caching of geometries
+// In Dumux, one has the option to activate/deactivate the grid-wide caching of geometries
 // and variables. If active, the CPU time can be significantly reduced as less dynamic
 // memory allocation procedures are necessary. Per default, grid-wide caching is disabled
 // to ensure minimal memory requirements, however, in this example we want to active all
diff --git a/examples/1ptracer/main.cc b/examples/1ptracer/main.cc
index 94a15e82d6..31cbca6cde 100644
--- a/examples/1ptracer/main.cc
+++ b/examples/1ptracer/main.cc
@@ -171,7 +171,7 @@ int main(int argc, char** argv) try
     // We use the results of the 1p problem to calculate the volume fluxes across all sub-control volume
     // faces of the discretization and store them in the vector `volumeFlux`. In order to do so, we iterate
     // over all elements of the grid, and in each element compute the volume fluxes for all sub-control volume
-    // faces embeded in that element.
+    // faces embedded in that element.
     // [[codeblock]]
     using Scalar =  GetPropType<OnePTypeTag, Properties::Scalar>; // type for scalar values
     std::vector<Scalar> volumeFlux(gridGeometry->numScvf(), 0.0);
diff --git a/examples/1ptracer/properties_1p.hh b/examples/1ptracer/properties_1p.hh
index 00b90cf88a..805476138d 100644
--- a/examples/1ptracer/properties_1p.hh
+++ b/examples/1ptracer/properties_1p.hh
@@ -61,7 +61,7 @@
 // using the cell centered finite volume scheme with two-point-flux approximation
 // are conveniently specialized for our new type tag.
 // However, some properties depend on user choices and no meaningful default value can be set.
-// Those properties will be adressed later in this file.
+// Those properties will be addressed later in this file.
 // [[codeblock]]
 // We enter the namespace Dumux::Properties in order to import the entire Dumux namespace for general use:
 namespace Dumux::Properties {
@@ -124,7 +124,7 @@ struct LocalResidual<TypeTag, TTag::IncompressibleTest> { using type = OnePIncom
 // throughout the simulation.
 // [[details]] caching properties
 //
-// In Dumux, one has the option to activate/deactive the grid-wide caching of
+// In Dumux, one has the option to activate/deactivate the grid-wide caching of
 // geometries and variables. If active, the CPU time can be significantly reduced
 // as less dynamic memory allocation procedures are necessary. Per default, grid-wide
 // caching is disabled to ensure minimal memory requirements, however, in this example we
diff --git a/examples/1ptracer/properties_tracer.hh b/examples/1ptracer/properties_tracer.hh
index a7db2bd574..efb94a3068 100644
--- a/examples/1ptracer/properties_tracer.hh
+++ b/examples/1ptracer/properties_tracer.hh
@@ -111,7 +111,7 @@ public:
 // the cell centered finite volume scheme with two-point-flux approximation are
 // conveniently specialized for our new type tag.
 // However, some properties depend on user choices and no meaningful default value
-// can be set. Those properties will be adressed later in this file.
+// can be set. Those properties will be addressed later in this file.
 // [[codeblock]]
 namespace Properties {
 
@@ -161,7 +161,7 @@ struct UseMoles<TypeTag, TTag::TracerTest> { static constexpr bool value = false
 // Moreover, we specialize several properties related to efficiency optimizations
 // [[details]] caching properties
 // [[codeblock]]
-// In Dumux, one has the option to activate/deactive the grid-wide caching of geometries
+// In Dumux, one has the option to activate/deactivate the grid-wide caching of geometries
 // and variables. If active, the CPU time can be significantly reduced as less dynamic
 // memory allocation procedures are necessary. Per default, grid-wide caching is disabled
 // to ensure minimal memory requirements, however, in this example we want to active all
diff --git a/examples/1ptracer/spatialparams_1p.hh b/examples/1ptracer/spatialparams_1p.hh
index 1f7b8dbdcc..d6a8d7ccf2 100644
--- a/examples/1ptracer/spatialparams_1p.hh
+++ b/examples/1ptracer/spatialparams_1p.hh
@@ -80,7 +80,7 @@ public:
     // #### Generation of the random permeability field
     // We generate a random permeability field upon construction of the spatial parameters class
     // using lognormal distributions. The mean values for the permeability inside and outside of a
-    // low-permeable lens (given by the coorinates `lensLowerLeft_` and `lensUpperRight_`) are defined
+    // low-permeable lens (given by the coordinates `lensLowerLeft_` and `lensUpperRight_`) are defined
     // in the variables  `permeabilityLens_` and `permeability_`. The respective values are obtained
     // from the input file making use of the free function `getParam`. We use a standard deviarion
     // of 10% here and compute permeabily values for all elements of the computational grid.
@@ -136,7 +136,7 @@ public:
     // use the overload
     // `porosity(const Element&, const SubControlVolume&, const ElementSolution&)`
     // that is defined in the base class `FVPorousMediumFlowSpatialParamsOneP`. Per default, this
-    // fowards to the `porosityAtPos` function per default, which we overload here.
+    // forwards to the `porosityAtPos` function per default, which we overload here.
     Scalar porosityAtPos(const GlobalPosition& globalPos) const
     { return 0.2; }
 
diff --git a/examples/2pinfiltration/doc/2p.md b/examples/2pinfiltration/doc/2p.md
index f5f5869145..c7e5e94a61 100644
--- a/examples/2pinfiltration/doc/2p.md
+++ b/examples/2pinfiltration/doc/2p.md
@@ -204,7 +204,7 @@ The class implementation starts with some alias declarations and index definitio
 </details>
 
 In the constructor of the class, we call the parent type's constructor
-and read the intial values for the primary variables from a text file.
+and read the initial values for the primary variables from a text file.
 The function `readFileToContainer` is implemented in the header `dumux/io/container.hh`.
 
 ```cpp
@@ -311,7 +311,7 @@ Point sources are added by pushing them into the vector `pointSources`.
 The `PointSource` constructor takes two arguments.
 The first argument is a coordinate array containing the position in space,
 the second argument is an array of source value for each equation (in units of $`kg/s`$).
-Recall that the first eqution is the water phase mass balance
+Recall that the first equation is the water phase mass balance
 and the second equation is the DNAPL phase mass balance.
 
 ```cpp
diff --git a/examples/2pinfiltration/doc/main.md b/examples/2pinfiltration/doc/main.md
index b9e9d0a4d2..4d6cb19ed5 100644
--- a/examples/2pinfiltration/doc/main.md
+++ b/examples/2pinfiltration/doc/main.md
@@ -142,7 +142,7 @@ In the problem, we define the boundary and initial conditions and compute the po
     problem->computePointSourceMap();
 ```
 
-We initialize the solution vector and then use the solution vector to intialize the `gridVariables`.
+We initialize the solution vector and then use the solution vector to initialize the `gridVariables`.
 
 ```cpp
     using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
diff --git a/examples/2pinfiltration/main.cc b/examples/2pinfiltration/main.cc
index 6a182be9bd..d74be4dce8 100644
--- a/examples/2pinfiltration/main.cc
+++ b/examples/2pinfiltration/main.cc
@@ -109,7 +109,7 @@ int main(int argc, char** argv) try
     problem->computePointSourceMap();
      // [[/codeblock]]
 
-    // We initialize the solution vector and then use the solution vector to intialize the `gridVariables`.
+    // We initialize the solution vector and then use the solution vector to initialize the `gridVariables`.
     using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
     SolutionVector x;
     problem->applyInitialSolution(x);
diff --git a/examples/2pinfiltration/problem.hh b/examples/2pinfiltration/problem.hh
index 1db372e44f..dcb94de2a4 100644
--- a/examples/2pinfiltration/problem.hh
+++ b/examples/2pinfiltration/problem.hh
@@ -66,7 +66,7 @@ class PointSourceProblem : public PorousMediumFlowProblem<TypeTag>
     // [[/details]]
     //
     // In the constructor of the class, we call the parent type's constructor
-    // and read the intial values for the primary variables from a text file.
+    // and read the initial values for the primary variables from a text file.
     // The function `readFileToContainer` is implemented in the header `dumux/io/container.hh`.
 public:
     PointSourceProblem(std::shared_ptr<const GridGeometry> gridGeometry)
@@ -166,7 +166,7 @@ public:
     // The `PointSource` constructor takes two arguments.
     // The first argument is a coordinate array containing the position in space,
     // the second argument is an array of source value for each equation (in units of $`kg/s`$).
-    // Recall that the first eqution is the water phase mass balance
+    // Recall that the first equation is the water phase mass balance
     // and the second equation is the DNAPL phase mass balance.
     void addPointSources(std::vector<PointSource>& pointSources) const
     {
diff --git a/examples/README.md b/examples/README.md
index 87887f998f..bb14200691 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -34,7 +34,7 @@ You learn how to
 
 * solve a two-phase flow in porous media problem with two immiscible phases
 * set boundary conditions and a simple injection well
-* implement a problem with heterogenous material parameters
+* implement a problem with heterogeneous material parameters
 * use adaptive grid refinement around the saturation front
 
 </td>
diff --git a/examples/biomineralization/doc/fluidmaterial.md b/examples/biomineralization/doc/fluidmaterial.md
index 018ea8dc87..4cb7bec6d5 100644
--- a/examples/biomineralization/doc/fluidmaterial.md
+++ b/examples/biomineralization/doc/fluidmaterial.md
@@ -366,7 +366,7 @@ public:
     using Glucose = Components::Glucose<Scalar>;
     using SuspendedBiomass = Components::SuspendedBiomass<Scalar>;
 
-    // We define the binary coefficents file, which accounts for the interactions of the main fluids in our setup, water/brine and CO2
+    // We define the binary coefficients file, which accounts for the interactions of the main fluids in our setup, water/brine and CO2
     using Brine_CO2 = BinaryCoeff::Brine_CO2<Scalar, CO2Table, true>;
 
     // the type of parameter cache objects. this fluid system does not
@@ -502,7 +502,7 @@ and each component's and the phases' main components binary diffusion coefficien
         assert(temperature > 0);
         assert(pressure > 0);
 
-        // calulate the equilibrium composition for the given
+        // calculate the equilibrium composition for the given
         // temperature and pressure.
         Scalar xgH2O, xlH2O;
         Scalar xlCO2, xgCO2;
diff --git a/examples/biomineralization/doc/mainfile.md b/examples/biomineralization/doc/mainfile.md
index 0172952832..12270ff24e 100644
--- a/examples/biomineralization/doc/mainfile.md
+++ b/examples/biomineralization/doc/mainfile.md
@@ -45,7 +45,7 @@ the retrieval of input parameters specified in the input file or via the command
 #include <dumux/common/initialize.hh>
 ```
 
-The follwoing files contain the nonlinear Newtown method, the linear solver and the assembler
+The following files contain the nonlinear Newtown method, the linear solver and the assembler
 
 ```cpp
 #include <dumux/nonlinear/newtonsolver.hh>
@@ -158,7 +158,7 @@ on the basis of this solution, we initialize the grid variables
     gridVariables->init(x);
 ```
 
-We intialize the vtk output module. Each model has a predefined model specific output with relevant parameters for that model.
+We initialize the vtk output module. Each model has a predefined model specific output with relevant parameters for that model.
 
 ```cpp
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
diff --git a/examples/biomineralization/doc/setup.md b/examples/biomineralization/doc/setup.md
index 1824d6c3c3..7825d24cdb 100644
--- a/examples/biomineralization/doc/setup.md
+++ b/examples/biomineralization/doc/setup.md
@@ -202,11 +202,11 @@ Here, the number of injections and the corresponding parameters are defined base
         // We get the number of injections and the injection data file name from params.input
         numInjections_ = getParam<int>("Injection.NumInjections");
 
-        // We resize the permeability vector contaning the permeabilities for the additional output
+        // We resize the permeability vector containing the permeabilities for the additional output
         permeability_.resize(gridGeometry->numDofs());
 
         // We read from the injection data file which injection type we have in each episode.
-        // We will use this in the Neumann boundary condition to set time dependend, changing boundary conditions.
+        // We will use this in the Neumann boundary condition to set time dependent, changing boundary conditions.
         // We do this similarly to the episode ends in the main file.
         const auto injType = readFileToContainer<std::vector<int>>("injection_type.dat");
         // translate integer to InjectionProcess type
@@ -230,7 +230,7 @@ and print an error message if the test fails
     }
 ```
 
-In the follwing, functions to set the time, time step size and the index of the episode
+In the following, functions to set the time, time step size and the index of the episode
 are declared which are used the time loop in main.cc
 
 ```cpp
@@ -335,7 +335,7 @@ Since we have multiple injections durng the whole simulation period, the Neumann
         // injProcess == 1 codes for an injection of mineralization medium containing urea and calcium chloride.
         // Thus, we add BC terms for those components.
         // Additionally, we need to adjust the amount of water injected due to the high concentration of other components injected.
-        // Finally, we need to adapt the injected NaCorr concentration to account fo the lower pH.
+        // Finally, we need to adapt the injected NaCorr concentration to account for the lower pH.
         else if (injProcess == InjectionProcess::mineralization)
         {
             values[conti0EqIdx + wCompIdx] = - waterFlux * 0.8716 * densityW_ /FluidSystem::molarMass(wCompIdx);    //0.8716 factor accounts for less water per volume due to relatively high solute concentrations!
@@ -506,7 +506,7 @@ The permeability is added to the vtk output
     }
 ```
 
-### Declaring all necessary variables and private fuctions
+### Declaring all necessary variables and private functions
 The internal methods are defined here
 
 ```cpp
@@ -540,7 +540,7 @@ private:
 ```
 
 The remainder of the class contains an epsilon value used for floating point comparisons
-and parameters needed to describe the chemical processess.
+and parameters needed to describe the chemical processes.
 Additionally the problem name, the peremability vector as well as some time-parameters are declared
 <details><summary> Click to show private members</summary>
 eps is used as a small value for the definition of the boundary conditions
@@ -679,7 +679,7 @@ We include the laws for changing permeability based on porosity change according
 ### The spatial parameters class
 In the `ICPSpatialParams` class, we define all functions needed to describe
 the porous medium, e.g. porosity and permeability.
-We inherit from the `FVPorousMediumFlowSpatialParamsMP` class which is the base class for spatial paramters using finite volume discretization schemes.
+We inherit from the `FVPorousMediumFlowSpatialParamsMP` class which is the base class for spatial parameters using finite volume discretization schemes.
 
 ```cpp
 namespace Dumux {
@@ -854,7 +854,7 @@ and inherit the `properties` specialized for the type tags `TwoPNCMin` and `BoxM
 This way, most of the `properties` required for this simulations
 using the box scheme are conveniently specialized for our new `TypeTag`.
 However, some properties depend on user choices and no meaningful default value can be set.
-Those properties will be adressed later in this file.
+Those properties will be addressed later in this file.
 
 ```cpp
 namespace Dumux::Properties {
@@ -868,7 +868,7 @@ struct MICPColumnSimpleChemistry { using InheritsFrom = std::tuple<TwoPNCMin, Bo
 ### Property specializations
 
 In the following piece of code, mandatory `properties` for which no meaningful
-dafault can be set, are specialized for our type tag `MICPColumnSimpleChemistry`.
+default can be set, are specialized for our type tag `MICPColumnSimpleChemistry`.
 
 ```cpp
 // We set the grid to a 1D Yasp Grid
diff --git a/examples/biomineralization/main.cc b/examples/biomineralization/main.cc
index 8bccfdb60b..b6a70efd04 100644
--- a/examples/biomineralization/main.cc
+++ b/examples/biomineralization/main.cc
@@ -39,7 +39,7 @@
 #include <dumux/common/parameters.hh>
 #include <dumux/common/initialize.hh>
 
-// The follwoing files contain the nonlinear Newtown method, the linear solver and the assembler
+// The following files contain the nonlinear Newtown method, the linear solver and the assembler
 #include <dumux/nonlinear/newtonsolver.hh>
 #include <dumux/linear/amgbackend.hh>
 #include <dumux/assembly/fvassembler.hh>
@@ -120,7 +120,7 @@ int main(int argc, char** argv) try
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // We intialize the vtk output module. Each model has a predefined model specific output with relevant parameters for that model.
+    // We initialize the vtk output module. Each model has a predefined model specific output with relevant parameters for that model.
     // [[codeblock]]
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/examples/biomineralization/material/fluidsystems/biominsimplechemistry.hh b/examples/biomineralization/material/fluidsystems/biominsimplechemistry.hh
index ee407715cb..973f07db93 100644
--- a/examples/biomineralization/material/fluidsystems/biominsimplechemistry.hh
+++ b/examples/biomineralization/material/fluidsystems/biominsimplechemistry.hh
@@ -96,7 +96,7 @@ public:
     using Glucose = Components::Glucose<Scalar>;
     using SuspendedBiomass = Components::SuspendedBiomass<Scalar>;
 
-    // We define the binary coefficents file, which accounts for the interactions of the main fluids in our setup, water/brine and CO2
+    // We define the binary coefficients file, which accounts for the interactions of the main fluids in our setup, water/brine and CO2
     using Brine_CO2 = BinaryCoeff::Brine_CO2<Scalar, CO2Table, true>;
 
     // the type of parameter cache objects. this fluid system does not
@@ -199,7 +199,7 @@ public:
         switch (compIdx) {
             case H2OIdx: return H2O::molarMass();
             // actually, the molar mass of brine is only needed for diffusion
-            // but since chloride and sodium are accounted for seperately
+            // but since chloride and sodium are accounted for separately
             // only the molar mass of water is returned.
             case TCIdx: return CO2::molarMass();
             case CaIdx: return Ca::molarMass();
@@ -299,7 +299,7 @@ public:
         assert(temperature > 0);
         assert(pressure > 0);
 
-        // calulate the equilibrium composition for the given
+        // calculate the equilibrium composition for the given
         // temperature and pressure.
         Scalar xgH2O, xlH2O;
         Scalar xlCO2, xgCO2;
diff --git a/examples/biomineralization/problem.hh b/examples/biomineralization/problem.hh
index 0f67f08e98..8116e11c8d 100644
--- a/examples/biomineralization/problem.hh
+++ b/examples/biomineralization/problem.hh
@@ -186,11 +186,11 @@ public:
         // We get the number of injections and the injection data file name from params.input
         numInjections_ = getParam<int>("Injection.NumInjections");
 
-        // We resize the permeability vector contaning the permeabilities for the additional output
+        // We resize the permeability vector containing the permeabilities for the additional output
         permeability_.resize(gridGeometry->numDofs());
 
         // We read from the injection data file which injection type we have in each episode.
-        // We will use this in the Neumann boundary condition to set time dependend, changing boundary conditions.
+        // We will use this in the Neumann boundary condition to set time dependent, changing boundary conditions.
         // We do this similarly to the episode ends in the main file.
         const auto injType = readFileToContainer<std::vector<int>>("injection_type.dat");
         // translate integer to InjectionProcess type
@@ -215,7 +215,7 @@ public:
     }
     // [[/codeblock]]
 
-    // In the follwing, functions to set the time, time step size and the index of the episode
+    // In the following, functions to set the time, time step size and the index of the episode
     // are declared which are used the time loop in main.cc
     // [[codeblock]]
     void setTime(const Scalar t)
@@ -316,7 +316,7 @@ public:
         // injProcess == 1 codes for an injection of mineralization medium containing urea and calcium chloride.
         // Thus, we add BC terms for those components.
         // Additionally, we need to adjust the amount of water injected due to the high concentration of other components injected.
-        // Finally, we need to adapt the injected NaCorr concentration to account fo the lower pH.
+        // Finally, we need to adapt the injected NaCorr concentration to account for the lower pH.
         else if (injProcess == InjectionProcess::mineralization)
         {
             values[conti0EqIdx + wCompIdx] = - waterFlux * 0.8716 * densityW_ /FluidSystem::molarMass(wCompIdx);    //0.8716 factor accounts for less water per volume due to relatively high solute concentrations!
@@ -485,7 +485,7 @@ public:
     }
     // [[/codeblock]]
 
-// ### Declaring all necessary variables and private fuctions
+// ### Declaring all necessary variables and private functions
 // The internal methods are defined here
 // [[codeblock]]
 private:
@@ -518,7 +518,7 @@ private:
     // [[/codeblock]]
 
     // The remainder of the class contains an epsilon value used for floating point comparisons
-    // and parameters needed to describe the chemical processess.
+    // and parameters needed to describe the chemical processes.
     // Additionally the problem name, the peremability vector as well as some time-parameters are declared
     // [[details]] private members
     // eps is used as a small value for the definition of the boundary conditions
diff --git a/examples/biomineralization/properties.hh b/examples/biomineralization/properties.hh
index 62fd78f775..fea806e1e9 100644
--- a/examples/biomineralization/properties.hh
+++ b/examples/biomineralization/properties.hh
@@ -62,7 +62,7 @@
 // This way, most of the `properties` required for this simulations
 // using the box scheme are conveniently specialized for our new `TypeTag`.
 // However, some properties depend on user choices and no meaningful default value can be set.
-// Those properties will be adressed later in this file.
+// Those properties will be addressed later in this file.
 // [[codeblock]]
 namespace Dumux::Properties {
 
@@ -75,7 +75,7 @@ struct MICPColumnSimpleChemistry { using InheritsFrom = std::tuple<TwoPNCMin, Bo
 // ### Property specializations
 //
 // In the following piece of code, mandatory `properties` for which no meaningful
-// dafault can be set, are specialized for our type tag `MICPColumnSimpleChemistry`.
+// default can be set, are specialized for our type tag `MICPColumnSimpleChemistry`.
 
 // [[codeblock]]
 // We set the grid to a 1D Yasp Grid
diff --git a/examples/biomineralization/spatialparams.hh b/examples/biomineralization/spatialparams.hh
index af7ee8184e..3520e97747 100644
--- a/examples/biomineralization/spatialparams.hh
+++ b/examples/biomineralization/spatialparams.hh
@@ -43,7 +43,7 @@
 // ### The spatial parameters class
 // In the `ICPSpatialParams` class, we define all functions needed to describe
 // the porous medium, e.g. porosity and permeability.
-// We inherit from the `FVPorousMediumFlowSpatialParamsMP` class which is the base class for spatial paramters using finite volume discretization schemes.
+// We inherit from the `FVPorousMediumFlowSpatialParamsMP` class which is the base class for spatial parameters using finite volume discretization schemes.
 
 // [[codeblock]]
 namespace Dumux {
diff --git a/examples/convert_code_to_doc.py b/examples/convert_code_to_doc.py
index 0ec2fdd331..dd242c29e7 100755
--- a/examples/convert_code_to_doc.py
+++ b/examples/convert_code_to_doc.py
@@ -59,9 +59,9 @@ def transformCode(code, rules, codeFileName):
     # Enable toggling content between [[content]] and [[/content]]
     def wrapContentIntoDetails(token):
         beginDetails = "//\n// <details open>\n"
-        summmary = "// <summary><b>Click to hide/show the file documentation</b> (or inspect the [source code]({}))</summary>\n//\n".format(codeFileName)
+        summary = "// <summary><b>Click to hide/show the file documentation</b> (or inspect the [source code]({}))</summary>\n//\n".format(codeFileName)
         endDetails = "\n//\n// </details>\n"
-        return beginDetails + summmary + token[0] + endDetails
+        return beginDetails + summary + token[0] + endDetails
     wrapContent = parseTaggedContent("content", action=wrapContentIntoDetails)
     code = wrapContent.transformString(code)
 
diff --git a/examples/generate_example_docs.py b/examples/generate_example_docs.py
index a803c2392f..8d15163ce5 100755
--- a/examples/generate_example_docs.py
+++ b/examples/generate_example_docs.py
@@ -11,7 +11,7 @@ if sys.version_info[0] < 3:
 from convert_code_to_doc import *
 
 class Navigation:
-    """Add nagivation bars to examples with subpages"""
+    """Add navigation bars to examples with subpages"""
 
     def __init__(self, config, dir):
         # read and check the configuration
diff --git a/examples/porenetwork_upscaling/doc/upscalinghelper.md b/examples/porenetwork_upscaling/doc/upscalinghelper.md
index d5ce31fcde..8f5ec93b78 100644
--- a/examples/porenetwork_upscaling/doc/upscalinghelper.md
+++ b/examples/porenetwork_upscaling/doc/upscalinghelper.md
@@ -61,7 +61,7 @@ permeability $`\mathbf{K}`$ [m$`^2`$] can be evaluated.
         // get the domain side lengths from the problem
         auto sideLengths = problem.sideLengths();
 
-        // create temporary stringstream with fixed scientifc formatting without affecting std::cout
+        // create temporary stringstream with fixed scientific formatting without affecting std::cout
         std::ostream tmp(std::cout.rdbuf());
         tmp << std::fixed << std::scientific;
         static constexpr char dirNames[] = "xyz";
diff --git a/examples/porenetwork_upscaling/upscalinghelper.hh b/examples/porenetwork_upscaling/upscalinghelper.hh
index 0b42822229..6f25be6032 100644
--- a/examples/porenetwork_upscaling/upscalinghelper.hh
+++ b/examples/porenetwork_upscaling/upscalinghelper.hh
@@ -46,7 +46,7 @@ struct UpscalingHelper
         // get the domain side lengths from the problem
         auto sideLengths = problem.sideLengths();
 
-        // create temporary stringstream with fixed scientifc formatting without affecting std::cout
+        // create temporary stringstream with fixed scientific formatting without affecting std::cout
         std::ostream tmp(std::cout.rdbuf());
         tmp << std::fixed << std::scientific;
         static constexpr char dirNames[] = "xyz";
diff --git a/examples/shallowwaterfriction/README.md b/examples/shallowwaterfriction/README.md
index 2b98d77446..5f153425b5 100644
--- a/examples/shallowwaterfriction/README.md
+++ b/examples/shallowwaterfriction/README.md
@@ -41,11 +41,11 @@ is applied for the outflow. Normal flow is assumed, therefore the water
 depth at the right border is calculated using the equation
 of Gauckler, Manning and Strickler.
 
-### Initial conditons
+### Initial conditions
 The initial water depth is set to 1 m, which is slightly higher than the normal flow
 water depth (0.87 m). Therefore, we expect a decreasing
 water level during the simulation until the normal flow condition is reached in
-the entire model domain. The inital velocity is set to zero.
+the entire model domain. The initial velocity is set to zero.
 
 ## Model description
 As mentioned above, this examples uses the shallow water equations (SWEs) to solve the problem.
diff --git a/examples/shallowwaterfriction/doc/_intro.md b/examples/shallowwaterfriction/doc/_intro.md
index 172ca8fb06..9b616a9fb8 100644
--- a/examples/shallowwaterfriction/doc/_intro.md
+++ b/examples/shallowwaterfriction/doc/_intro.md
@@ -39,11 +39,11 @@ is applied for the outflow. Normal flow is assumed, therefore the water
 depth at the right border is calculated using the equation
 of Gauckler, Manning and Strickler.
 
-### Initial conditons
+### Initial conditions
 The initial water depth is set to 1 m, which is slightly higher than the normal flow
 water depth (0.87 m). Therefore, we expect a decreasing
 water level during the simulation until the normal flow condition is reached in
-the entire model domain. The inital velocity is set to zero.
+the entire model domain. The initial velocity is set to zero.
 
 ## Model description
 As mentioned above, this examples uses the shallow water equations (SWEs) to solve the problem.
diff --git a/examples/shallowwaterfriction/doc/main.md b/examples/shallowwaterfriction/doc/main.md
index 24b19fc54c..4172a6fcaa 100644
--- a/examples/shallowwaterfriction/doc/main.md
+++ b/examples/shallowwaterfriction/doc/main.md
@@ -67,7 +67,7 @@ in `gridmanager.hh`.
 #include <dumux/io/grid/gridmanager_yasp.hh>
 ```
 
-We include the header file specifing the properties of this example
+We include the header file specifying the properties of this example
 
 ```cpp
 #include "properties.hh"
diff --git a/examples/shallowwaterfriction/doc/swe.md b/examples/shallowwaterfriction/doc/swe.md
index b69c8e01fd..a84c1b9b18 100644
--- a/examples/shallowwaterfriction/doc/swe.md
+++ b/examples/shallowwaterfriction/doc/swe.md
@@ -155,7 +155,7 @@ class from which we will derive.
 #include <dumux/freeflow/shallowwater/problem.hh>
 ```
 
-In addition, we need the boundaryflux header, which handels the flux over
+In addition, we need the boundaryflux header, which handles the flux over
 the model boundaries.
 
 ```cpp
@@ -279,7 +279,7 @@ The bottom friction is a source term and therefore handled by the `source` funct
 
         NumEqVector source (0.0);
 
-        // Since the bed slope source term is handels within the flux computation,
+        // Since the bed slope source term is handles within the flux computation,
         // in this model the bottom friction is the only source term.
         source += bottomFrictionSource(element, fvGeometry, elemVolVars, scv);
 
@@ -334,7 +334,7 @@ because we use a weak imposition.
 In the following function we implement the __Neumann boundary conditions__.
 Due to the weak imposition we calculate the flux at the boundary with a Riemann solver.
 This needs the state of a virtual cell outside of the boundary (`boundaryStateVariables`),
-wich is calculated with the Riemann invariants
+which is calculated with the Riemann invariants
 (see: Yoon and Kang, "Finite Volume Model for Two-Dimensional Shallow Water Flows on Unstructured Grids").
 
 ```cpp
diff --git a/examples/shallowwaterfriction/main.cc b/examples/shallowwaterfriction/main.cc
index ea8c4649ee..c28d65422d 100644
--- a/examples/shallowwaterfriction/main.cc
+++ b/examples/shallowwaterfriction/main.cc
@@ -52,7 +52,7 @@
 // in `gridmanager.hh`.
 #include <dumux/io/grid/gridmanager_yasp.hh>
 
-// We include the header file specifing the properties of this example
+// We include the header file specifying the properties of this example
 #include "properties.hh"
 // [[/details]]
 //
diff --git a/examples/shallowwaterfriction/problem.hh b/examples/shallowwaterfriction/problem.hh
index eee68f25d2..9d23b530e4 100644
--- a/examples/shallowwaterfriction/problem.hh
+++ b/examples/shallowwaterfriction/problem.hh
@@ -33,7 +33,7 @@
 // The first include we need here is the `ShallowWaterProblem` class, the base
 // class from which we will derive.
 #include <dumux/freeflow/shallowwater/problem.hh>
-// In addition, we need the boundaryflux header, which handels the flux over
+// In addition, we need the boundaryflux header, which handles the flux over
 // the model boundaries.
 #include <dumux/freeflow/shallowwater/boundaryfluxes.hh>
 // Include the `BoundaryTypes` class which specifies the boundary types set in this problem.
@@ -143,7 +143,7 @@ public:
 
         NumEqVector source (0.0);
 
-        // Since the bed slope source term is handels within the flux computation,
+        // Since the bed slope source term is handles within the flux computation,
         // in this model the bottom friction is the only source term.
         source += bottomFrictionSource(element, fvGeometry, elemVolVars, scv);
 
@@ -196,7 +196,7 @@ public:
     // In the following function we implement the __Neumann boundary conditions__.
     // Due to the weak imposition we calculate the flux at the boundary with a Riemann solver.
     // This needs the state of a virtual cell outside of the boundary (`boundaryStateVariables`),
-    // wich is calculated with the Riemann invariants
+    // which is calculated with the Riemann invariants
     // (see: Yoon and Kang, "Finite Volume Model for Two-Dimensional Shallow Water Flows on Unstructured Grids").
     // [[codeblock]]
     NeumannFluxes neumann(const Element& element,
diff --git a/python/README.md b/python/README.md
index 8328928ed6..2f44dbb1ce 100644
--- a/python/README.md
+++ b/python/README.md
@@ -31,7 +31,7 @@ git clone https://gitlab.dune-project.org/core/dune-istl
 git clone https://git.iws.uni-stuttgart.de/dumux-repositories/dumux
 ```
 
-Create and activate a new virutal environment in which the
+Create and activate a new virtual environment in which the
 Python modules will be installed in editable mode (symlinked)
 
 ```
diff --git a/python/dumux/common/properties.py b/python/dumux/common/properties.py
index e0ff577666..aac62c724f 100644
--- a/python/dumux/common/properties.py
+++ b/python/dumux/common/properties.py
@@ -141,7 +141,7 @@ def listTypeTags():
     """List all available TypeTags/Models that can be inherited from"""
 
     print("\n**********************************\n")
-    print("The following TypeTags are availabe:")
+    print("The following TypeTags are available:")
     for key, value in _typeTags.items():
         print(key, ":", value["description"])
     print("\n**********************************")
diff --git a/python/dumux/material/components/__init__.py b/python/dumux/material/components/__init__.py
index eb09790713..b7cdb126ca 100644
--- a/python/dumux/material/components/__init__.py
+++ b/python/dumux/material/components/__init__.py
@@ -17,7 +17,7 @@ _components = {
 
 def listComponents():
     """List all available component names"""
-    print("The following components are availabe:")
+    print("The following components are available:")
     print(_components.keys())
 
 
diff --git a/test/discretization/cellcentered/tpfa/test_tpfafvgeometry_nonconforming.cc b/test/discretization/cellcentered/tpfa/test_tpfafvgeometry_nonconforming.cc
index 53cb0c725f..0b5b2c380d 100644
--- a/test/discretization/cellcentered/tpfa/test_tpfafvgeometry_nonconforming.cc
+++ b/test/discretization/cellcentered/tpfa/test_tpfafvgeometry_nonconforming.cc
@@ -37,7 +37,7 @@
 #include <dumux/adaptive/markelements.hh>
 #include <dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh>
 
-#ifndef DOXGEN
+#ifndef DOXYGEN
 namespace Dumux {
 namespace Test {
 
diff --git a/test/discretization/facecentered/staggered/test_staggeredfvgeometry.cc b/test/discretization/facecentered/staggered/test_staggeredfvgeometry.cc
index b5ecdc04a7..c337b726aa 100644
--- a/test/discretization/facecentered/staggered/test_staggeredfvgeometry.cc
+++ b/test/discretization/facecentered/staggered/test_staggeredfvgeometry.cc
@@ -168,7 +168,7 @@ int main (int argc, char *argv[])
     intersectionWriter.addField(dofIndices, "dofIdx");
     intersectionWriter.write("staggered");
 
-    // Check indicies for all dofs called in the stencil. Center element, scv local index 1 (global index 49)
+    // Check indices for all dofs called in the stencil. Center element, scv local index 1 (global index 49)
     for (const auto& element : elements(leafGridView))
     {
         auto eIdx = gridGeometry.elementMapper().index(element);
@@ -193,9 +193,9 @@ int main (int argc, char *argv[])
                         if constexpr (useHigherOrder)
                         {
                             // do higher order stuff
-//    PSUEDO                if(scvf.hasForwardNeighbor())
+//    PSEUDO                if(scvf.hasForwardNeighbor())
 //    CODE                      std::cout << "-- -- The \"forward\" velocity is located at scv " << scvf.forwardScvIdx() << "\n";
-//    PSUEDO                if(scvf.hasBackwardNeighbor())
+//    PSEUDO                if(scvf.hasBackwardNeighbor())
 //    CODE                      std::cout << "-- -- The \"backward\" velocity is located at scv " << scvf.backwardScvIdx() << "\n";
                         }
                     }
@@ -206,7 +206,7 @@ int main (int argc, char *argv[])
                         if(!scvf.isLateral())
                             continue;
 
-                        // Write out the indicies for the transported velocity calculation
+                        // Write out the indices for the transported velocity calculation
                         std::string firstOrSecond = (latCount < 1) ? "first" : "second";
                         std::cout << "-- -- The " << firstOrSecond << "lateral scvf has the index " << scvf.index() << "\n";
                         std::cout << "-- -- - The \"inner\" transported velocity is located at scv " << scvf.insideScvIdx() << "\n";
@@ -214,14 +214,14 @@ int main (int argc, char *argv[])
                         if constexpr (useHigherOrder)
                         {
                             // do higher order stuff for transported velocity
-//  PSUEDO                  if (scvf.hasSecondParallelNeighbor())
+//  PSEUDO                  if (scvf.hasSecondParallelNeighbor())
 //  CODE                        std::cout << "-- -- - The \"second outer\" transported velocity is located at scv " << scvf.secondOuterScvIdx() << "\n";
 
                             // const auto& firstParallelScv = fvGeometry.scv(scvf.outsideScvIdx());
                         }
-                        // Write out the indicies for the transporting velocity calculation
+                        // Write out the indices for the transporting velocity calculation
                         const auto& orthogonalScvf = fvGeometry.lateralOrthogonalScvf(scvf);
-                        std::cout << "-- -- - The orthagonal scvf has the index " << orthogonalScvf.index() << "\n";
+                        std::cout << "-- -- - The orthogonal scvf has the index " << orthogonalScvf.index() << "\n";
                         std::cout << "-- -- - The \"inner transporting velocity is located at scv " << orthogonalScvf.insideScvIdx() << "\n";
                         std::cout << "-- -- - The \"outer transporting velocity is located at scv " << orthogonalScvf.outsideScvIdx() << "\n";
                         latCount++;
diff --git a/test/discretization/staggered/test_staggered_free_flow_geometry.cc b/test/discretization/staggered/test_staggered_free_flow_geometry.cc
index 5a1871830c..fbe6a7a195 100644
--- a/test/discretization/staggered/test_staggered_free_flow_geometry.cc
+++ b/test/discretization/staggered/test_staggered_free_flow_geometry.cc
@@ -93,14 +93,14 @@ int main (int argc, char *argv[])
     auto leafGridView = grid->leafGridView();
     GridGeometry gridGeometry(leafGridView);
 
-    std::cout << "Abbreviatons:\n"
-              << "pos - postition of face center\n"
+    std::cout << "Abbreviations:\n"
+              << "pos - position of face center\n"
               << "fIdx - face index\n"
               << "dofIdx (self/oppo.) - dofIdx on face (self/opposite)\n"
               << "norm in/out - dofIdx on face normal to own face (within own element / in adjacent element)\n"
               << "par - dofIdx on face parallel to own face\n"
-              << "normDist - distance bewteen the dofs on the faces normal the own face\n"
-              << "parDist - distance bewteen the dof on the parallel face and the one on the own face\n"
+              << "normDist - distance between the dofs on the faces normal the own face\n"
+              << "parDist - distance between the dof on the parallel face and the one on the own face\n"
               << "norm in/out - dofIdx on face normal to own face (within own element / in adjacent element)" << std::endl;
 
     // iterate over elements. For every element get fv geometry and loop over scvs and scvfaces
diff --git a/test/discretization/test_walldistance.cc b/test/discretization/test_walldistance.cc
index 79775bcf62..1a57534c0c 100644
--- a/test/discretization/test_walldistance.cc
+++ b/test/discretization/test_walldistance.cc
@@ -135,7 +135,7 @@ int main(int argc, char** argv)
 {
     using namespace Dumux;
 
-    // initialize MPI and multithreading environemnt
+    // initialize MPI and multithreading environment
     // finalize is done automatically on exit
     initialize(argc, argv);
 
diff --git a/test/freeflow/navierstokes/angeli/main.cc b/test/freeflow/navierstokes/angeli/main.cc
index 6fc2168be6..9f0ce7fe6c 100644
--- a/test/freeflow/navierstokes/angeli/main.cc
+++ b/test/freeflow/navierstokes/angeli/main.cc
@@ -135,7 +135,7 @@ int main(int argc, char** argv)
     massGridVariables->init(x[massIdx]);
     momentumGridVariables->init(x[momentumIdx]);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<MassTypeTag, Properties::IOFields>;
     VtkOutputModule vtkWriter(*massGridVariables, x[massIdx], massProblem->name());
     IOFields::initOutputModule(vtkWriter); // Add model specific output fields
diff --git a/test/freeflow/navierstokes/channel/1d/main.cc b/test/freeflow/navierstokes/channel/1d/main.cc
index 3846f43136..1ec180bc5e 100644
--- a/test/freeflow/navierstokes/channel/1d/main.cc
+++ b/test/freeflow/navierstokes/channel/1d/main.cc
@@ -121,7 +121,7 @@ int main(int argc, char** argv)
                                                  std::make_tuple(momentumGridVariables, massGridVariables),
                                                  couplingManager);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<MassTypeTag, Properties::IOFields>;
     VtkOutputModule vtkWriter(*massGridVariables, x[massIdx], massProblem->name());
     IOFields::initOutputModule(vtkWriter); // Add model specific output fields
diff --git a/test/freeflow/navierstokes/channel/2d/main.cc b/test/freeflow/navierstokes/channel/2d/main.cc
index 990ff82dfc..23d0b01877 100644
--- a/test/freeflow/navierstokes/channel/2d/main.cc
+++ b/test/freeflow/navierstokes/channel/2d/main.cc
@@ -138,7 +138,7 @@ int main(int argc, char** argv)
 
     // initialize the coupling stencils
     couplingManager->init(momentumProblem, massProblem, std::make_tuple(momentumGridVariables, massGridVariables), x, xOld);
-    // intializing the gridvariables requires the coupling manager to be set up
+    // initializing the gridvariables requires the coupling manager to be set up
     momentumGridVariables->init(x[momentumIdx]);
     massGridVariables->init(x[massIdx]);
 
diff --git a/test/freeflow/navierstokes/channel/2d/problem.hh b/test/freeflow/navierstokes/channel/2d/problem.hh
index a936e67100..46bfde7528 100644
--- a/test/freeflow/navierstokes/channel/2d/problem.hh
+++ b/test/freeflow/navierstokes/channel/2d/problem.hh
@@ -329,7 +329,7 @@ public:
 
     /*!
      * \brief Returns a reference pressure at a given sub control volume face.
-     *        This pressure is substracted from the actual pressure for the momentum balance
+     *        This pressure is subtracted from the actual pressure for the momentum balance
      *        which potentially helps to improve numerical accuracy by avoiding issues related do floating point arithmetic.
      */
     Scalar referencePressure(const Element& element,
diff --git a/test/freeflow/navierstokes/channel/pipe/main.cc b/test/freeflow/navierstokes/channel/pipe/main.cc
index 5931fd3068..1a3b5ce67a 100644
--- a/test/freeflow/navierstokes/channel/pipe/main.cc
+++ b/test/freeflow/navierstokes/channel/pipe/main.cc
@@ -118,7 +118,7 @@ int main(int argc, char** argv)
                                                  std::make_tuple(momentumGridVariables, massGridVariables),
                                                  couplingManager);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<MassTypeTag, Properties::IOFields>;
     VtkOutputModule vtkWriter(*massGridVariables, x[massIdx], massProblem->name());
     IOFields::initOutputModule(vtkWriter); // Add model specific output fields
diff --git a/test/freeflow/navierstokes/donea/main.cc b/test/freeflow/navierstokes/donea/main.cc
index b73053a1f0..5630023704 100644
--- a/test/freeflow/navierstokes/donea/main.cc
+++ b/test/freeflow/navierstokes/donea/main.cc
@@ -115,7 +115,7 @@ int main(int argc, char** argv)
 
     // initialize the coupling stencils
     couplingManager->init(momentumProblem, massProblem, std::make_tuple(momentumGridVariables, massGridVariables), x);
-    // intializing the gridvariables requires the coupling manager to be set up
+    // initializing the gridvariables requires the coupling manager to be set up
     momentumGridVariables->init(x[momentumIdx]);
     massGridVariables->init(x[massIdx]);
 
diff --git a/test/freeflow/navierstokes/kovasznay/main.cc b/test/freeflow/navierstokes/kovasznay/main.cc
index bd183065ab..ae9095502a 100644
--- a/test/freeflow/navierstokes/kovasznay/main.cc
+++ b/test/freeflow/navierstokes/kovasznay/main.cc
@@ -126,7 +126,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     IOFields::initOutputModule(vtkWriter); // Add model specific output fields
diff --git a/test/freeflow/navierstokes/periodic/main.cc b/test/freeflow/navierstokes/periodic/main.cc
index 5d16b04fb6..03ac976b2d 100644
--- a/test/freeflow/navierstokes/periodic/main.cc
+++ b/test/freeflow/navierstokes/periodic/main.cc
@@ -121,7 +121,7 @@ int main(int argc, char** argv)
                                                  std::make_tuple(momentumGridVariables, massGridVariables),
                                                  couplingManager);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<MassTypeTag, Properties::IOFields>;
     VtkOutputModule vtkWriter(*massGridVariables, x[massIdx], massProblem->name());
     IOFields::initOutputModule(vtkWriter); // Add model specific output fields
diff --git a/test/freeflow/navierstokesnc/channel/main.cc b/test/freeflow/navierstokesnc/channel/main.cc
index c60a13c491..329e343415 100644
--- a/test/freeflow/navierstokesnc/channel/main.cc
+++ b/test/freeflow/navierstokesnc/channel/main.cc
@@ -106,7 +106,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     IOFields::initOutputModule(vtkWriter); // Add model specific output fields
diff --git a/test/freeflow/navierstokesnc/densitydrivenflow/main.cc b/test/freeflow/navierstokesnc/densitydrivenflow/main.cc
index 73b5156314..3ada7130bd 100644
--- a/test/freeflow/navierstokesnc/densitydrivenflow/main.cc
+++ b/test/freeflow/navierstokesnc/densitydrivenflow/main.cc
@@ -105,7 +105,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     IOFields::initOutputModule(vtkWriter); // Add model specific output fields
diff --git a/test/freeflow/navierstokesnc/maxwellstefan/main.cc b/test/freeflow/navierstokesnc/maxwellstefan/main.cc
index ab4d6a53f9..825f76808c 100644
--- a/test/freeflow/navierstokesnc/maxwellstefan/main.cc
+++ b/test/freeflow/navierstokesnc/maxwellstefan/main.cc
@@ -105,7 +105,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     IOFields::initOutputModule(vtkWriter); //! Add model specific output fields
diff --git a/test/freeflow/rans/main.cc b/test/freeflow/rans/main.cc
index 9db95a1dbc..1a77dad8d6 100644
--- a/test/freeflow/rans/main.cc
+++ b/test/freeflow/rans/main.cc
@@ -132,7 +132,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     IOFields::initOutputModule(vtkWriter); // Add model specific output fields
diff --git a/test/freeflow/ransnc/main.cc b/test/freeflow/ransnc/main.cc
index 130f2b7db3..c31ac48e38 100644
--- a/test/freeflow/ransnc/main.cc
+++ b/test/freeflow/ransnc/main.cc
@@ -164,7 +164,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     IOFields::initOutputModule(vtkWriter); // Add model specific output fields
diff --git a/test/freeflow/shallowwater/bowl/main.cc b/test/freeflow/shallowwater/bowl/main.cc
index 8e86b68190..dfd9388c2f 100644
--- a/test/freeflow/shallowwater/bowl/main.cc
+++ b/test/freeflow/shallowwater/bowl/main.cc
@@ -178,7 +178,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module and analytical solution
+    // initialize the vtk output module and analytical solution
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables,x, problem->name());
     auto exactSolution = computeAnalyticalSolution<SolutionVector>(0.0, *problem);
     const auto exactWaterDepth = SolutionComponent<SolutionVector, 0>(exactSolution);
diff --git a/test/freeflow/shallowwater/bowl/problem.hh b/test/freeflow/shallowwater/bowl/problem.hh
index 3e0c688f37..2e47371749 100644
--- a/test/freeflow/shallowwater/bowl/problem.hh
+++ b/test/freeflow/shallowwater/bowl/problem.hh
@@ -44,7 +44,7 @@ namespace Dumux {
  * (e.g. 150x150 cells) in combination with a large time step size. Using the new limiting
  * (UpwindFluxLimiting = true) will help to improve the convergence for such cases.
  *
- * This test uses a low mesh resoultion and only ensures that UpwindFluxLimiting for the mobility
+ * This test uses a low mesh resolution and only ensures that UpwindFluxLimiting for the mobility
  * works. For low mesh resolution the solution is very diffusive so that the oscillation is dampened.
  * This gets better with grid refinement (not tested here).
  *
diff --git a/test/freeflow/shallowwater/dambreak/main.cc b/test/freeflow/shallowwater/dambreak/main.cc
index e875a5ccb8..6d54e96fda 100644
--- a/test/freeflow/shallowwater/dambreak/main.cc
+++ b/test/freeflow/shallowwater/dambreak/main.cc
@@ -110,7 +110,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
 
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables,x, problem->name());
diff --git a/test/freeflow/shallowwater/dambreak/problem.hh b/test/freeflow/shallowwater/dambreak/problem.hh
index 29f607070d..20f7462ae4 100644
--- a/test/freeflow/shallowwater/dambreak/problem.hh
+++ b/test/freeflow/shallowwater/dambreak/problem.hh
@@ -89,7 +89,7 @@ public:
         return exactVelocityX_;
     }
 
-    //! Udpate the analytical solution
+    //! Update the analytical solution
     template<class SolutionVector, class GridVariables>
     void updateAnalyticalSolution(const SolutionVector& curSol,
                                   const GridVariables& gridVariables,
@@ -161,7 +161,7 @@ public:
     }
 
     /*!
-     * \brief Specifies the neumann bounday
+     * \brief Specifies the neumann boundary
      * \param element
      * \param fvGeometry
      * \param elemVolVars
diff --git a/test/freeflow/shallowwater/roughchannel/main.cc b/test/freeflow/shallowwater/roughchannel/main.cc
index 37259eddcd..8fcb0136da 100644
--- a/test/freeflow/shallowwater/roughchannel/main.cc
+++ b/test/freeflow/shallowwater/roughchannel/main.cc
@@ -102,7 +102,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
 
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables,x, problem->name());
diff --git a/test/freeflow/shallowwater/roughchannel/problem.hh b/test/freeflow/shallowwater/roughchannel/problem.hh
index 837b7d83d2..1ce8bfd6fd 100644
--- a/test/freeflow/shallowwater/roughchannel/problem.hh
+++ b/test/freeflow/shallowwater/roughchannel/problem.hh
@@ -40,7 +40,7 @@ namespace Dumux {
  *
  * At the left border a discharge
  * boundary condition is applied and at the right border a water depth boundary condition.
- * All other boundaries are set to no-flow. Normal flow is assumed, therefor the water depth
+ * All other boundaries are set to no-flow. Normal flow is assumed, therefore the water depth
  * at the right border can be calculated with the formular of Gaukler-Manning-Strickler.
  *
  * \f[
@@ -122,7 +122,7 @@ public:
         return pow(abs(discharge)*manningN/sqrt(bedSlope), 0.6);
     }
 
-    //! Udpate the analytical solution
+    //! Update the analytical solution
     void updateAnalyticalSolution()
     {
         using std::abs;
diff --git a/test/geomechanics/poroelastic/main.cc b/test/geomechanics/poroelastic/main.cc
index 2eb53bbb6d..26575be96d 100644
--- a/test/geomechanics/poroelastic/main.cc
+++ b/test/geomechanics/poroelastic/main.cc
@@ -141,7 +141,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module and output fields
+    // initialize the vtk output module and output fields
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     using VtkOutputModule = Dumux::VtkOutputModule<GridVariables, SolutionVector>;
     VtkOutputModule vtkWriter(*gridVariables, x, problem->name());
diff --git a/test/geometry/test_makegeometry.cc b/test/geometry/test_makegeometry.cc
index ebec049c4b..c4dd37b0b5 100644
--- a/test/geometry/test_makegeometry.cc
+++ b/test/geometry/test_makegeometry.cc
@@ -76,11 +76,11 @@ void permutatePointsAndTest(const std::vector<GlobalPosition>& cornerPoints,
                 std::cout << printCorners();
                 std::cout << std::endl;
 
-                std::cout << "actual area: " << area << ", area after permuation: " << quad.volume() << std::endl;
+                std::cout << "actual area: " << area << ", area after permutation: " << quad.volume() << std::endl;
             }
 
             if (!Dune::FloatCmp::eq(quad.volume(), area))
-                DUNE_THROW(Dune::InvalidStateException, "Area of quadrilateral after permuation of input points is wrong");
+                DUNE_THROW(Dune::InvalidStateException, "Area of quadrilateral after permutation of input points is wrong");
 
             if (verbose)
                 std::cout  << "checking point intersection: \n";
diff --git a/test/io/gridmanager/test_gridmanager_subgrid.cc b/test/io/gridmanager/test_gridmanager_subgrid.cc
index 283ad4ca17..cf13417bc0 100644
--- a/test/io/gridmanager/test_gridmanager_subgrid.cc
+++ b/test/io/gridmanager/test_gridmanager_subgrid.cc
@@ -108,7 +108,7 @@ void testSubGrid(const std::string& hostGridName)
         vtkWriter.write("subgrid_right");
     }
 
-    // create without contructing host grid first
+    // create without constructing host grid first
     {
         std::cout << "Constructing SubGrid from lambda without specifying host grid" << std::endl;
 
diff --git a/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc b/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc
index e9b60a2f85..5d873f8ac7 100644
--- a/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc
+++ b/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc
@@ -308,7 +308,7 @@ int main(int argc, char** argv)
     if (mpiHelper.rank() == 0)
         DumuxMessage::print(/*firstCall=*/true);
 
-    // initialize ther parameters
+    // initialize the parameters
     auto parameters = [](auto& params)
     {
         params["Problem.Name"] = "test";
diff --git a/test/material/compositionalflash/test_compositionalflash.cc b/test/material/compositionalflash/test_compositionalflash.cc
index 6690895d59..bd096ee643 100644
--- a/test/material/compositionalflash/test_compositionalflash.cc
+++ b/test/material/compositionalflash/test_compositionalflash.cc
@@ -163,7 +163,7 @@ void completeReferenceFluidState(FluidState &fs,
     // calculate the other saturation
     fs.setSaturation(otherPhaseIdx, 1.0 - fs.saturation(refPhaseIdx));
 
-    // calulate the capillary pressure
+    // calculate the capillary pressure
     const auto pc = material.capillaryPressures(fs, /*liquidPhaseIdx=*/0);
     fs.setPressure(otherPhaseIdx,
                    fs.pressure(refPhaseIdx)
@@ -194,7 +194,7 @@ void completeReferenceFluidStateSequential(FluidState &fs,
     (fs.moleFraction(refPhaseIdx, 0) * FluidSystem::molarMass(0) +
     (1. - fs.moleFraction(refPhaseIdx, 0)) * FluidSystem::molarMass(1));
 
-    // calulate the capillary pressure
+    // calculate the capillary pressure
     const auto pc = material.capillaryPressures(fs, /*liquidPhaseIdx=*/0);
 
     PhaseVector phasePressures(0.0);
@@ -368,7 +368,7 @@ int main()
     // set pressure of the liquid phase
     fsRef.setPressure(liquidPhaseIdx, 1e6);
 
-    // calulate the capillary pressure
+    // calculate the capillary pressure
     const auto pc = material2.capillaryPressures(fsRef, /*wPhaseIdx=*/0);
     fsRef.setPressure(gasPhaseIdx,
                       fsRef.pressure(liquidPhaseIdx)
diff --git a/test/material/fluidsystems/checkfluidsystem.hh b/test/material/fluidsystems/checkfluidsystem.hh
index cb5857fe67..c71250d391 100644
--- a/test/material/fluidsystems/checkfluidsystem.hh
+++ b/test/material/fluidsystems/checkfluidsystem.hh
@@ -380,7 +380,7 @@ int checkFluidState(const BaseFluidState &fs)
 //     std::cout << collectedWarnings;
     if (collectedErrors.empty()) // success
     {
-        std::cout << "... successfull" << std::endl;
+        std::cout << "... successful" << std::endl;
         std::cout << "----------------------------------" << std::endl;
         return 0;
     }
diff --git a/test/material/immiscibleflash/test_immiscibleflash.cc b/test/material/immiscibleflash/test_immiscibleflash.cc
index 228097d556..e4cd4ec255 100644
--- a/test/material/immiscibleflash/test_immiscibleflash.cc
+++ b/test/material/immiscibleflash/test_immiscibleflash.cc
@@ -135,7 +135,7 @@ void completeReferenceFluidState(FluidState &fs,
     // calculate the other saturation
     fs.setSaturation(otherPhaseIdx, 1.0 - fs.saturation(refPhaseIdx));
 
-    // calulate the capillary pressure
+    // calculate the capillary pressure
     const auto pc = material.capillaryPressures(fs, /*wPhaseIdx=*/0);
     fs.setPressure(otherPhaseIdx,
                    fs.pressure(refPhaseIdx)
diff --git a/test/material/ncpflash/test_ncpflash.cc b/test/material/ncpflash/test_ncpflash.cc
index d0fd1d7088..d7b83fbbfc 100644
--- a/test/material/ncpflash/test_ncpflash.cc
+++ b/test/material/ncpflash/test_ncpflash.cc
@@ -136,7 +136,7 @@ void completeReferenceFluidState(FluidState &fs,
     // calculate the other saturation
     fs.setSaturation(otherPhaseIdx, 1.0 - fs.saturation(refPhaseIdx));
 
-    // calulate the capillary pressure
+    // calculate the capillary pressure
     const auto pc = material.capillaryPressures(fs, /*wPhaseIdx=*/0);
     fs.setPressure(otherPhaseIdx,
                    fs.pressure(refPhaseIdx)
@@ -271,7 +271,7 @@ int main()
     // set pressure of the liquid phase
     fsRef.setPressure(liquidPhaseIdx, 1e6);
 
-    // calulate the capillary pressure
+    // calculate the capillary pressure
     const auto pc = material2.capillaryPressures(fsRef, /*wPhaseIdx=*/0);
     fsRef.setPressure(gasPhaseIdx,
                       fsRef.pressure(liquidPhaseIdx)
diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/main.cc b/test/multidomain/boundary/darcydarcy/1p_1p/main.cc
index 01877d9066..394e15fbef 100644
--- a/test/multidomain/boundary/darcydarcy/1p_1p/main.cc
+++ b/test/multidomain/boundary/darcydarcy/1p_1p/main.cc
@@ -182,7 +182,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using SolutionVector0 = std::decay_t<decltype(sol[domain0Idx])>;
     VtkOutputModule<GridVariables0, SolutionVector0> vtkWriter0(*gridVariables0, sol[domain0Idx], problem0->name());
     GetPropType<SubTypeTag0, Properties::IOFields>::initOutputModule(vtkWriter0);
diff --git a/test/multidomain/boundary/darcydarcy/1p_2p/main.cc b/test/multidomain/boundary/darcydarcy/1p_2p/main.cc
index 6850c29f41..c143be2ea1 100644
--- a/test/multidomain/boundary/darcydarcy/1p_2p/main.cc
+++ b/test/multidomain/boundary/darcydarcy/1p_2p/main.cc
@@ -151,7 +151,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using SolutionVector0 = std::decay_t<decltype(sol[domain0Idx])>;
     VtkOutputModule<GridVariables0, SolutionVector0> vtkWriter0(*gridVariables0, sol[domain0Idx], problem0->name());
     GetPropType<SubTypeTag0, Properties::IOFields>::initOutputModule(vtkWriter0);
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/main.cc b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/main.cc
index 5b24f8bf54..525130a5bc 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/main.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/main.cc
@@ -157,7 +157,7 @@ int main(int argc, char** argv)
     auto darcyGridVariables = std::make_shared<DarcyGridVariables>(darcyProblem, darcyFvGridGeometry);
     darcyGridVariables->init(sol[darcyIdx]);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     const auto stokesName = getParam<std::string>("Problem.Name") + "_" + stokesProblem->name();
     const auto darcyName = getParam<std::string>("Problem.Name") + "_" + darcyProblem->name();
 
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/properties.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/properties.hh
index b535c71874..b28f1fd8b2 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/properties.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/properties.hh
@@ -94,7 +94,7 @@ struct Grid<TypeTag, TTag::DarcyOnePTwoC> { using type = Dune::YaspGrid<2>; };
 template<class TypeTag>
 struct MolecularDiffusionType<TypeTag, TTag::DarcyOnePTwoC> { using type = DIFFUSIONTYPE; };
 
-// Set the spatial paramaters type
+// Set the spatial parameters type
 template<class TypeTag>
 struct SpatialParams<TypeTag, TTag::DarcyOnePTwoC>
 {
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/main.cc b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/main.cc
index 34d9626640..6369541bb9 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/main.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/main.cc
@@ -145,7 +145,7 @@ int main(int argc, char** argv)
     auto darcyGridVariables = std::make_shared<DarcyGridVariables>(darcyProblem, darcyFvGridGeometry);
     darcyGridVariables->init(sol[darcyIdx]);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     StaggeredVtkOutputModule<StokesGridVariables, decltype(stokesSol)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesProblem->name());
     GetPropType<StokesTypeTag, Properties::IOFields>::initOutputModule(stokesVtkWriter);
     stokesVtkWriter.write(0.0);
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/properties.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/properties.hh
index 8c51a1d6ea..5183916bf4 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/properties.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/properties.hh
@@ -81,7 +81,7 @@ struct EffectiveDiffusivityModel<TypeTag, TTag::DarcyOnePTwoC>
 template<class TypeTag>
 struct Grid<TypeTag, TTag::DarcyOnePTwoC> { using type = Dune::YaspGrid<2>; };
 
-// Set the spatial paramaters type
+// Set the spatial parameters type
 template<class TypeTag>
 struct SpatialParams<TypeTag, TTag::DarcyOnePTwoC>
 {
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc
index e74582aa57..da5c5ab2b4 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc
@@ -146,7 +146,7 @@ int main(int argc, char** argv)
     auto darcyGridVariables = std::make_shared<DarcyGridVariables>(darcyProblem, darcyFvGridGeometry);
     darcyGridVariables->init(sol[darcyIdx]);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     StaggeredVtkOutputModule<StokesGridVariables, decltype(stokesSol)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesProblem->name());
     GetPropType<StokesTypeTag, Properties::IOFields>::initOutputModule(stokesVtkWriter);
     stokesVtkWriter.write(0.0);
diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/main.cc b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/main.cc
index 407d8638cc..dfcc36c2b5 100644
--- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/main.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/main.cc
@@ -144,7 +144,7 @@ int main(int argc, char** argv)
     auto darcyGridVariables = std::make_shared<DarcyGridVariables>(darcyProblem, darcyFvGridGeometry);
     darcyGridVariables->init(sol[darcyIdx]);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     const auto stokesName = getParam<std::string>("Problem.Name") + "_" + stokesProblem->name();
     const auto darcyName = getParam<std::string>("Problem.Name") + "_" + darcyProblem->name();
 
diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/properties.hh b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/properties.hh
index 14d9f014b5..dccf98f09c 100644
--- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/properties.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/properties.hh
@@ -75,7 +75,7 @@ struct Grid<TypeTag, TTag::DarcyOnePThreeC> { using type = Dune::YaspGrid<2>; };
 template<class TypeTag>
 struct MolecularDiffusionType<TypeTag, TTag::DarcyOnePThreeC> { using type = MaxwellStefansLaw<TypeTag>; };
 
-// Set the spatial paramaters type
+// Set the spatial parameters type
 template<class TypeTag>
 struct SpatialParams<TypeTag, TTag::DarcyOnePThreeC>
 {
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/main.cc b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/main.cc
index 3eb28eaefc..5bac0bcc90 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/main.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/main.cc
@@ -243,7 +243,7 @@ int main(int argc, char** argv)
     auto darcyGridVariables = std::make_shared<DarcyGridVariables>(darcyProblem, darcyGridGeometry);
     darcyGridVariables->init(sol[darcyIdx]);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using Scalar = typename Traits::Scalar;
     StaggeredVtkOutputModule<FreeFlowGridVariables, decltype(freeFlowSol)> freeFlowVtkWriter(*freeFlowGridVariables, freeFlowSol, freeFlowProblem->name());
     GetPropType<FreeFlowTypeTag, Properties::IOFields>::initOutputModule(freeFlowVtkWriter);
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/main.cc b/test/multidomain/boundary/stokesdarcy/1p_1p/main.cc
index cb2221f266..a79268b8fc 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/main.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/main.cc
@@ -125,7 +125,7 @@ int main(int argc, char** argv)
     auto darcyGridVariables = std::make_shared<DarcyGridVariables>(darcyProblem, darcyFvGridGeometry);
     darcyGridVariables->init(sol[darcyIdx]);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     StaggeredVtkOutputModule<StokesGridVariables, decltype(stokesSol)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesProblem->name());
     GetPropType<StokesTypeTag, Properties::IOFields>::initOutputModule(stokesVtkWriter);
     stokesVtkWriter.write(0.0);
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/main.cc b/test/multidomain/boundary/stokesdarcy/1p_2p/main.cc
index 7cc472f576..872ff5284b 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/main.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/main.cc
@@ -139,7 +139,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     StaggeredVtkOutputModule<StokesGridVariables, Traits::SolutionVector> stokesVtkWriter(*stokesGridVariables, sol, stokesProblem->name());
     GetPropType<StokesTypeTag, Properties::IOFields>::initOutputModule(stokesVtkWriter);
     stokesVtkWriter.write(0.0);
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/main.cc b/test/multidomain/embedded/1d3d/1p2c_richards2c/main.cc
index b8fa50bd27..0cecaa07ca 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/main.cc
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/main.cc
@@ -312,7 +312,7 @@ int main(int argc, char** argv)
 
     const bool outputVtk = getParam<bool>("Problem.EnableVtkOutput", true);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using BulkSolutionVector = std::decay_t<decltype(sol[bulkIdx])>;
     VtkOutputModule<BulkGridVariables, BulkSolutionVector> bulkVtkWriter(*bulkGridVariables, sol[bulkIdx], bulkProblem->name());
     GetPropType<BulkTypeTag, Properties::IOFields>::initOutputModule(bulkVtkWriter);
diff --git a/test/multidomain/embedded/1d3d/1p_1p/convergence.py b/test/multidomain/embedded/1d3d/1p_1p/convergence.py
index b1f054c127..26ddb37f5a 100755
--- a/test/multidomain/embedded/1d3d/1p_1p/convergence.py
+++ b/test/multidomain/embedded/1d3d/1p_1p/convergence.py
@@ -5,7 +5,7 @@
 # Koch et al (2020) JCP
 # https://doi.org/10.1016/j.jcp.2020.109370
 #
-# The scipt also prints a table with errors and
+# The script also prints a table with errors and
 # convergence rates
 """
 
diff --git a/test/multidomain/embedded/1d3d/1p_1p/main.cc b/test/multidomain/embedded/1d3d/1p_1p/main.cc
index 7ed3cece2f..48715f89f3 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/main.cc
+++ b/test/multidomain/embedded/1d3d/1p_1p/main.cc
@@ -128,7 +128,7 @@ int main(int argc, char** argv)
 
     const bool writeVtk = getParam<bool>("Vtk.EnableVtkOutput", true);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using BulkSolutionVector = std::decay_t<decltype(sol[bulkIdx])>;
     VtkOutputModule<BulkGridVariables, BulkSolutionVector> bulkVtkWriter(*bulkGridVariables, sol[bulkIdx], bulkProblem->name());
     GetPropType<BulkTypeTag, Properties::IOFields>::initOutputModule(bulkVtkWriter);
@@ -218,7 +218,7 @@ int main(int argc, char** argv)
     auto norm3D = L2Norm<double>::computeErrorNorm(*bulkProblem, sol[bulkIdx], order);
     norm3D /= L2Norm<double>::computeNormalization(*bulkProblem, order);
 
-    // ouput result to terminal
+    // output result to terminal
     std::cout << "-----------------------------------------------------\n";
     std::cout << " L2_p1d: " << norm1D << " hmax_1d: " << hMaxLowDim << '\n'
               << " L2_p3d: " << norm3D << " hmax_3d: " << hMaxBulk << '\n'
diff --git a/test/multidomain/embedded/1d3d/1p_richards/main.cc b/test/multidomain/embedded/1d3d/1p_richards/main.cc
index 53dbfbb8c7..433234c27e 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/main.cc
+++ b/test/multidomain/embedded/1d3d/1p_richards/main.cc
@@ -146,7 +146,7 @@ int main(int argc, char** argv)
     const auto episodeLength = getParam<Scalar>("TimeLoop.EpisodeLength");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using BulkSolutionVector = std::decay_t<decltype(sol[bulkIdx])>;
     VtkOutputModule<BulkGridVariables, BulkSolutionVector> bulkVtkWriter(*bulkGridVariables, sol[bulkIdx], bulkProblem->name());
     GetPropType<BulkTypeTag, Properties::IOFields>::initOutputModule(bulkVtkWriter);
diff --git a/test/multidomain/embedded/2d3d/1p_1p/main.cc b/test/multidomain/embedded/2d3d/1p_1p/main.cc
index 186ed3cc17..d9fa37f82a 100644
--- a/test/multidomain/embedded/2d3d/1p_1p/main.cc
+++ b/test/multidomain/embedded/2d3d/1p_1p/main.cc
@@ -184,7 +184,7 @@ int main(int argc, char** argv)
     auto lowDimGridVariables = std::make_shared<LowDimGridVariables>(lowDimProblem, lowDimFvGridGeometry);
     lowDimGridVariables->init(sol[lowDimIdx]);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using BulkSolutionVector = std::decay_t<decltype(sol[bulkIdx])>;
     VtkOutputModule<BulkGridVariables, BulkSolutionVector> bulkVtkWriter(*bulkGridVariables, sol[bulkIdx], bulkProblem->name());
     GetPropType<BulkTypeTag, Properties::IOFields>::initOutputModule(bulkVtkWriter);
@@ -206,7 +206,7 @@ int main(int argc, char** argv)
     using LinearSolver = BlockDiagILU0BiCGSTABSolver;
     auto linearSolver = std::make_shared<LinearSolver>();
 
-    // assemble & solve & udpate
+    // assemble & solve & update
     const auto solverType = getParam<std::string>("Problem.SolverType", "linear");
     if (solverType == "linear")
         assembleSolveUpdate(assembler, linearSolver, couplingManager, sol, SolverTag::Linear{});
diff --git a/test/multidomain/facet/1p_1p/analytical/convergencetest.py b/test/multidomain/facet/1p_1p/analytical/convergencetest.py
index 1a6e4636f3..eaf62b216f 100755
--- a/test/multidomain/facet/1p_1p/analytical/convergencetest.py
+++ b/test/multidomain/facet/1p_1p/analytical/convergencetest.py
@@ -98,7 +98,7 @@ for permIndex in range(0, len(k)):
 
     # test is failed if the rate in the matrix is lower than 1.9
     if abs(matrix_rates[len(matrix_rates)-1]) < 1.9:
-        sys.stderr.write("\n\nComputed a convergence rate of " + str(abs(matrix_rates[len(matrix_rates)-1])) + ", which is below the treshold of 1.9. Test fails...\n")
+        sys.stderr.write("\n\nComputed a convergence rate of " + str(abs(matrix_rates[len(matrix_rates)-1])) + ", which is below the threshold of 1.9. Test fails...\n")
         sys.exit(1)
 
     # write last output for the matrix
diff --git a/test/multidomain/facet/1p_1p/analytical/main.cc b/test/multidomain/facet/1p_1p/analytical/main.cc
index ee2973b7a7..56918fccc7 100644
--- a/test/multidomain/facet/1p_1p/analytical/main.cc
+++ b/test/multidomain/facet/1p_1p/analytical/main.cc
@@ -234,7 +234,7 @@ int main(int argc, char** argv)
     bulkGridVariables->init(x[bulkId]);
     lowDimGridVariables->init(x[lowDimId]);
 
-    // intialize the vtk output modulell
+    // initialize the vtk output modulell
     const auto bulkDM = BulkFVGridGeometry::discMethod == DiscretizationMethods::box ? Dune::VTK::nonconforming : Dune::VTK::conforming;
     using BulkSolutionVector = std::decay_t<decltype(x[bulkId])>;
     using LowDimSolutionVector = std::decay_t<decltype(x[lowDimId])>;
diff --git a/test/multidomain/facet/1p_1p/gravity/main.cc b/test/multidomain/facet/1p_1p/gravity/main.cc
index f88d2a81ab..d0aedeae7b 100644
--- a/test/multidomain/facet/1p_1p/gravity/main.cc
+++ b/test/multidomain/facet/1p_1p/gravity/main.cc
@@ -131,7 +131,7 @@ int main(int argc, char** argv)
     bulkGridVariables->init(x[bulkId]);
     lowDimGridVariables->init(x[lowDimId]);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using BulkSolutionVector = std::decay_t<decltype(x[bulkId])>;
     using LowDimSolutionVector = std::decay_t<decltype(x[lowDimId])>;
     VtkOutputModule<BulkGridVariables, BulkSolutionVector> bulkVtkWriter(*bulkGridVariables, x[bulkId], bulkProblem->name(), "Bulk");
diff --git a/test/multidomain/facet/1p_1p/linearprofile/main.cc b/test/multidomain/facet/1p_1p/linearprofile/main.cc
index 3590e1a813..44650ea406 100644
--- a/test/multidomain/facet/1p_1p/linearprofile/main.cc
+++ b/test/multidomain/facet/1p_1p/linearprofile/main.cc
@@ -132,7 +132,7 @@ int main(int argc, char** argv)
     bulkGridVariables->init(x[bulkId]);
     lowDimGridVariables->init(x[lowDimId]);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using BulkSolutionVector = std::decay_t<decltype(x[bulkId])>;
     using LowDimSolutionVector = std::decay_t<decltype(x[lowDimId])>;
     VtkOutputModule<BulkGridVariables, BulkSolutionVector> bulkVtkWriter(*bulkGridVariables, x[bulkId], bulkProblem->name(), "Bulk");
diff --git a/test/multidomain/facet/1p_1p/threedomain/main.cc b/test/multidomain/facet/1p_1p/threedomain/main.cc
index 6d050b2355..53a30e9d93 100644
--- a/test/multidomain/facet/1p_1p/threedomain/main.cc
+++ b/test/multidomain/facet/1p_1p/threedomain/main.cc
@@ -176,7 +176,7 @@ int main(int argc, char** argv)
     GridVariables gridVars(gridGeometry.asTuple(), problem.asTuple());
     gridVars.init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     const std::array<std::string, 3> vtkOutputNames{{problem[bulkId].name(), problem[facetId].name(), problem[edgeId].name()}};
     MultiDomainVtkOutputModule<Traits> vtkWriter(gridVars.asTuple(), x, vtkOutputNames);
     vtkWriter.initDefaultOutputFields();
diff --git a/test/multidomain/facet/1pnc_1pnc/main.cc b/test/multidomain/facet/1pnc_1pnc/main.cc
index 56987b9bc6..7300c59764 100644
--- a/test/multidomain/facet/1pnc_1pnc/main.cc
+++ b/test/multidomain/facet/1pnc_1pnc/main.cc
@@ -156,7 +156,7 @@ int main(int argc, char** argv)
     bulkGridVariables->init(x[bulkId]);
     facetGridVariables->init(x[facetId]);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using BulkSolutionVector = std::decay_t<decltype(x[bulkId])>;
     using FacetSolutionVector = std::decay_t<decltype(x[facetId])>;
     VtkOutputModule<BulkGridVariables, BulkSolutionVector> bulkVtkWriter(*bulkGridVariables, x[bulkId], bulkProblem->name(), "Bulk");
diff --git a/test/multidomain/facet/test_vertexmapper.cc b/test/multidomain/facet/test_vertexmapper.cc
index 5c210e026c..eb573018ca 100644
--- a/test/multidomain/facet/test_vertexmapper.cc
+++ b/test/multidomain/facet/test_vertexmapper.cc
@@ -45,7 +45,7 @@
 #define FACETGRIDTYPE Dune::FoamGrid<2, 3>
 #endif
 
-// returns a ficticious displacement for a given position
+// returns a fictitious displacement for a given position
 template<class GlobalPosition>
 GlobalPosition getDisplacement(const GlobalPosition& pos)
 {
@@ -140,7 +140,7 @@ int main (int argc, char *argv[])
     if (bulkDim == 2 && numDofsAfter != 180)
         DUNE_THROW(Dune::InvalidStateException, "2d test: Number of dofs after enrichment is expected to be 180 but is " << numDofsAfter);
 
-    // vector for output of ficticious displacement
+    // vector for output of fictitious displacement
     static constexpr int bulkDimWorld = BulkGrid::dimensionworld;
     using Displacement = Dune::FieldVector<double, bulkDimWorld>;
     std::vector< Displacement > displacement(mapper.size(), Displacement(0.0));
diff --git a/test/multidomain/facet/tracer_tracer/main.cc b/test/multidomain/facet/tracer_tracer/main.cc
index e46a5722a2..f8ec5ebb2e 100644
--- a/test/multidomain/facet/tracer_tracer/main.cc
+++ b/test/multidomain/facet/tracer_tracer/main.cc
@@ -243,7 +243,7 @@ int main(int argc, char** argv)
         bulkGridVariables->init(x[bulkId]);
         lowDimGridVariables->init(x[lowDimId]);
 
-        // intialize the vtk output module
+        // initialize the vtk output module
         const auto bulkDM = BulkFVGridGeometry::discMethod == DiscretizationMethods::box ? Dune::VTK::nonconforming : Dune::VTK::conforming;
         using BulkSolutionVector = std::decay_t<decltype(x[bulkId])>;
         using LowDimSolutionVector = std::decay_t<decltype(x[lowDimId])>;
@@ -337,7 +337,7 @@ int main(int argc, char** argv)
     bulkGridVariables->init(x[bulkId]);
     lowDimGridVariables->init(x[lowDimId]);
 
-    // intialize the vtk output modules
+    // initialize the vtk output modules
     const auto bulkDM = BulkFVGridGeometry::discMethod == DiscretizationMethods::box ? Dune::VTK::nonconforming : Dune::VTK::conforming;
     using BulkSolutionVector = std::decay_t<decltype(x[bulkId])>;
     using LowDimSolutionVector = std::decay_t<decltype(x[lowDimId])>;
diff --git a/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh b/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh
index 4a36053066..5edaf99a08 100644
--- a/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh
+++ b/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh
@@ -103,7 +103,7 @@ public:
     { return PrimaryVariables(0.0); }
 
     /*!
-     * \brief Evaluates the Dirichlet boudnary conditions for a control volume.
+     * \brief Evaluates the Dirichlet boundary conditions for a control volume.
      *
      * \param globalPos The position for which the initial condition should be evaluated
      */
diff --git a/test/multidomain/poromechanics/el1p/main.cc b/test/multidomain/poromechanics/el1p/main.cc
index 384e8a6e5a..316c2add0c 100644
--- a/test/multidomain/poromechanics/el1p/main.cc
+++ b/test/multidomain/poromechanics/el1p/main.cc
@@ -120,7 +120,7 @@ int main(int argc, char** argv)
     onePGridVariables->init(x[onePId]);
     poroMechGridVariables->init(x[poroMechId]);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using OnePVtkOutputModule = Dumux::VtkOutputModule<OnePGridVariables, GetPropType<OnePTypeTag, Properties::SolutionVector>>;
     using PoroMechVtkOutputModule = Dumux::VtkOutputModule<PoroMechGridVariables, GetPropType<PoroMechTypeTag, Properties::SolutionVector>>;
     OnePVtkOutputModule onePVtkWriter(*onePGridVariables, x[onePId], onePProblem->name());
diff --git a/test/multidomain/poromechanics/el2p/main.cc b/test/multidomain/poromechanics/el2p/main.cc
index 462dcdf16f..b0d563fc16 100644
--- a/test/multidomain/poromechanics/el2p/main.cc
+++ b/test/multidomain/poromechanics/el2p/main.cc
@@ -127,7 +127,7 @@ int main(int argc, char** argv)
     const auto maxDT = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.Dt");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using TwoPVtkOutputModule = Dumux::VtkOutputModule<TwoPGridVariables, GetPropType<TwoPTypeTag, Properties::SolutionVector>>;
     using PoroMechVtkOutputModule = Dumux::VtkOutputModule<PoroMechGridVariables, GetPropType<PoroMechTypeTag, Properties::SolutionVector>>;
     TwoPVtkOutputModule twoPVtkWriter(*twoPGridVariables, x[twoPId], twoPProblem->name());
diff --git a/test/porenetwork/1p/noncreepingflow/nonisothermal/main.cc b/test/porenetwork/1p/noncreepingflow/nonisothermal/main.cc
index fcfa580dfa..7830fab699 100644
--- a/test/porenetwork/1p/noncreepingflow/nonisothermal/main.cc
+++ b/test/porenetwork/1p/noncreepingflow/nonisothermal/main.cc
@@ -106,7 +106,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     Dumux::PoreNetwork::VtkOutputModule<GridVariables, GetPropType<TypeTag, Properties::FluxVariables>, SolutionVector>
         vtkWriter(*gridVariables, x, problem->name());
diff --git a/test/porenetwork/1p/noncreepingflow/spatialparams.hh b/test/porenetwork/1p/noncreepingflow/spatialparams.hh
index a18b1690ea..8ffd25cce8 100644
--- a/test/porenetwork/1p/noncreepingflow/spatialparams.hh
+++ b/test/porenetwork/1p/noncreepingflow/spatialparams.hh
@@ -82,14 +82,14 @@ public:
         return this->gridGeometry().poreInscribedRadius(scv.dofIndex());
     }
 
-    // dimensionless kinetic-energy coeffiecient which for non-creeping flow is equal to 1.0
+    // dimensionless kinetic-energy coefficient which for non-creeping flow is equal to 1.0
     template<class ElementSolutionVector>
     Scalar kineticEnergyCoefficient(const Element& element,
                  const SubControlVolume& scv,
                  const ElementSolutionVector& elemSol) const
     { return 1.0; }
 
-    // dimensionless momentum coeffiecient which for non-creeping flow is equal to 1.0
+    // dimensionless momentum coefficient which for non-creeping flow is equal to 1.0
     template<class ElementSolutionVector>
     Scalar momentumCoefficient(const Element& element,
               const SubControlVolume& scv,
diff --git a/test/porenetwork/1p/nonisothermal/main.cc b/test/porenetwork/1p/nonisothermal/main.cc
index 38e00ec108..f229d985b7 100644
--- a/test/porenetwork/1p/nonisothermal/main.cc
+++ b/test/porenetwork/1p/nonisothermal/main.cc
@@ -112,7 +112,7 @@ int main(int argc, char** argv)
     if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
         restartTime = getParam<Scalar>("TimeLoop.Restart");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     PoreNetwork::VtkOutputModule<GridVariables, GetPropType<TypeTag, Properties::FluxVariables>, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     IOFields::initOutputModule(vtkWriter); //! Add model specific output fields
diff --git a/test/porenetwork/1pnc/main.cc b/test/porenetwork/1pnc/main.cc
index 5a94356150..8ca9a7cb9e 100644
--- a/test/porenetwork/1pnc/main.cc
+++ b/test/porenetwork/1pnc/main.cc
@@ -111,7 +111,7 @@ int main(int argc, char** argv)
     if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
         restartTime = getParam<Scalar>("TimeLoop.Restart");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     PoreNetwork::VtkOutputModule<GridVariables, GetPropType<TypeTag, Properties::FluxVariables>, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     IOFields::initOutputModule(vtkWriter); //! Add model specific output fields
diff --git a/test/porenetwork/2p/main.cc b/test/porenetwork/2p/main.cc
index 72c37149ee..f578e4ec3d 100644
--- a/test/porenetwork/2p/main.cc
+++ b/test/porenetwork/2p/main.cc
@@ -111,7 +111,7 @@ int main(int argc, char** argv)
     if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
         restartTime = getParam<Scalar>("TimeLoop.Restart");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     PoreNetwork::VtkOutputModule<GridVariables, GetPropType<TypeTag, Properties::FluxVariables>, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     IOFields::initOutputModule(vtkWriter); //! Add model specific output fields
diff --git a/test/porenetwork/2p/params.input b/test/porenetwork/2p/params.input
index a798ce23cc..1565c1d815 100644
--- a/test/porenetwork/2p/params.input
+++ b/test/porenetwork/2p/params.input
@@ -9,7 +9,7 @@ ThroatCrossSectionShape = Square
 
 [Problem]
 Name = test_pnm_2p
-VtpOutputFrequency = -1 # Write every n-th time step. 0 only writes a file if an invasion / snap-off occured. -1 writes every step
+VtpOutputFrequency = -1 # Write every n-th time step. 0 only writes a file if an invasion / snap-off occurred. -1 writes every step
 EnableGravity = false
 CapillaryPressure = 5000
 UseFixedPressureAndSaturationBoundary = false
diff --git a/test/porenetwork/2p/params_ni.input b/test/porenetwork/2p/params_ni.input
index f7d00fa063..43b50b938d 100644
--- a/test/porenetwork/2p/params_ni.input
+++ b/test/porenetwork/2p/params_ni.input
@@ -9,7 +9,7 @@ ThroatCrossSectionShape = Square
 
 [Problem]
 Name = test_pnm2pni
-VtpOutputFrequency = 1 # Write every n-th time step. 0 only writes a file if an invasion / snap-off occured
+VtpOutputFrequency = 1 # Write every n-th time step. 0 only writes a file if an invasion / snap-off occurred
 CapillaryPressure = 5000
 EnableGravity = false
 
diff --git a/test/porenetwork/2p/static/main.cc b/test/porenetwork/2p/static/main.cc
index e88754fb8a..326b6dbea3 100644
--- a/test/porenetwork/2p/static/main.cc
+++ b/test/porenetwork/2p/static/main.cc
@@ -125,7 +125,7 @@ int main(int argc, char** argv)
     const Scalar finalPc = getParam<Scalar>("Problem.FinalPc");
     const bool allowDraingeOfOutlet = getParam<bool>("Problem.AllowDraingeOfOutlet", false);
 
-    // helper function to evalute the entry capillary pressure
+    // helper function to evaluate the entry capillary pressure
     auto getPcEntry = [&](const std::size_t eIdx)
     {
         const Scalar throatRadius =  gridGeometry->throatInscribedRadius(eIdx);
diff --git a/test/porousmediumflow/1p/compressible/instationary/main.cc b/test/porousmediumflow/1p/compressible/instationary/main.cc
index 9474eaf27e..81eec275d7 100644
--- a/test/porousmediumflow/1p/compressible/instationary/main.cc
+++ b/test/porousmediumflow/1p/compressible/instationary/main.cc
@@ -108,7 +108,7 @@ int main(int argc, char** argv)
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
     auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
     vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
diff --git a/test/porousmediumflow/1p/compressible/instationary/main_experimental.cc b/test/porousmediumflow/1p/compressible/instationary/main_experimental.cc
index 4de5e09016..00b3e44221 100644
--- a/test/porousmediumflow/1p/compressible/instationary/main_experimental.cc
+++ b/test/porousmediumflow/1p/compressible/instationary/main_experimental.cc
@@ -107,7 +107,7 @@ int main(int argc, char** argv)
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
     auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, gridVariables->dofs(), problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
     vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
diff --git a/test/porousmediumflow/1p/compressible/stationary/main.cc b/test/porousmediumflow/1p/compressible/stationary/main.cc
index c26cbea654..97f16a7846 100644
--- a/test/porousmediumflow/1p/compressible/stationary/main.cc
+++ b/test/porousmediumflow/1p/compressible/stationary/main.cc
@@ -99,7 +99,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/1p/convergence/analyticsolution/main.cc b/test/porousmediumflow/1p/convergence/analyticsolution/main.cc
index a3a6ba4f9d..2bcba09481 100644
--- a/test/porousmediumflow/1p/convergence/analyticsolution/main.cc
+++ b/test/porousmediumflow/1p/convergence/analyticsolution/main.cc
@@ -126,7 +126,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
     vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
diff --git a/test/porousmediumflow/1p/fracture2d3d/main.cc b/test/porousmediumflow/1p/fracture2d3d/main.cc
index f73e306d87..dc518975f3 100644
--- a/test/porousmediumflow/1p/fracture2d3d/main.cc
+++ b/test/porousmediumflow/1p/fracture2d3d/main.cc
@@ -106,7 +106,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/1p/isothermal/CMakeLists.txt b/test/porousmediumflow/1p/isothermal/CMakeLists.txt
index c5c3982128..f0c1cb9f61 100644
--- a/test/porousmediumflow/1p/isothermal/CMakeLists.txt
+++ b/test/porousmediumflow/1p/isothermal/CMakeLists.txt
@@ -55,7 +55,7 @@ dumux_add_test(NAME test_1p_forchheimer_box
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_forchheimer_box params_forchheimer.input -Problem.Name test_1p_forchheimer_box"
                         --zeroThreshold {"velocity_liq \(m/s\)":1e-12})
 
-# a gstat test (becaue it's a random permeability field we can't test against a reference solution)
+# a gstat test (because it's a random permeability field we can't test against a reference solution)
 dumux_add_test(NAME test_1p_gstat
               LABELS porousmediumflow 1p
               SOURCES main.cc
diff --git a/test/porousmediumflow/1p/isothermal/main.cc b/test/porousmediumflow/1p/isothermal/main.cc
index b9aef46c4e..aa09f83dda 100644
--- a/test/porousmediumflow/1p/isothermal/main.cc
+++ b/test/porousmediumflow/1p/isothermal/main.cc
@@ -105,7 +105,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/1p/network1d3d/main.cc b/test/porousmediumflow/1p/network1d3d/main.cc
index aee60d025d..1dae7ad342 100644
--- a/test/porousmediumflow/1p/network1d3d/main.cc
+++ b/test/porousmediumflow/1p/network1d3d/main.cc
@@ -106,7 +106,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/1p/network1d3d/problem.hh b/test/porousmediumflow/1p/network1d3d/problem.hh
index 23be48f477..d8b9e22fcf 100644
--- a/test/porousmediumflow/1p/network1d3d/problem.hh
+++ b/test/porousmediumflow/1p/network1d3d/problem.hh
@@ -174,7 +174,7 @@ public:
             source[conti0EqIdx] = K/volVars.viscosity()*volVars.density()
                                     *4.0*4.0*M_PI*M_PI*sin(4.0*M_PI*globalPos[2]);
         else
-            // the "/3.0" stems from the coordindate transformations on the lower branches
+            // the "/3.0" stems from the coordinate transformations on the lower branches
             source[conti0EqIdx] = K/volVars.viscosity()*volVars.density()
                                     *4.0*4.0*M_PI*M_PI*sin(4.0*M_PI*globalPos[2])/3.0;
 
diff --git a/test/porousmediumflow/1p/nonisothermal/main.cc b/test/porousmediumflow/1p/nonisothermal/main.cc
index 3de7462b0d..5ade81cf49 100644
--- a/test/porousmediumflow/1p/nonisothermal/main.cc
+++ b/test/porousmediumflow/1p/nonisothermal/main.cc
@@ -118,7 +118,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/1p/periodicbc/main.cc b/test/porousmediumflow/1p/periodicbc/main.cc
index 851f03c91b..1eb9aaf06d 100644
--- a/test/porousmediumflow/1p/periodicbc/main.cc
+++ b/test/porousmediumflow/1p/periodicbc/main.cc
@@ -98,7 +98,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     IOFields::initOutputModule(vtkWriter); // Add model specific output fields
diff --git a/test/porousmediumflow/1p/pointsources/timedependent/main.cc b/test/porousmediumflow/1p/pointsources/timedependent/main.cc
index 855603ba92..7c73f8d130 100644
--- a/test/porousmediumflow/1p/pointsources/timedependent/main.cc
+++ b/test/porousmediumflow/1p/pointsources/timedependent/main.cc
@@ -103,7 +103,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/1p/pointsources/timeindependent/main.cc b/test/porousmediumflow/1p/pointsources/timeindependent/main.cc
index bc6997ff07..979dc26ae1 100644
--- a/test/porousmediumflow/1p/pointsources/timeindependent/main.cc
+++ b/test/porousmediumflow/1p/pointsources/timeindependent/main.cc
@@ -103,7 +103,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/1p/rootbenchmark/main.cc b/test/porousmediumflow/1p/rootbenchmark/main.cc
index 493fbb7420..617b2168f8 100644
--- a/test/porousmediumflow/1p/rootbenchmark/main.cc
+++ b/test/porousmediumflow/1p/rootbenchmark/main.cc
@@ -82,7 +82,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     vtkWriter.addVolumeVariable([](const auto& v) { return v.pressure(); }, "p (Pa)");
     vtkWriter.addVolumeVariable([](const auto& v) { return 100*(v.pressure() - 1e5)/(1000*9.81); }, "psi (cm)");
diff --git a/test/porousmediumflow/1pnc/1p2c/isothermal/main.cc b/test/porousmediumflow/1pnc/1p2c/isothermal/main.cc
index e56d874d44..f84c8ad365 100644
--- a/test/porousmediumflow/1pnc/1p2c/isothermal/main.cc
+++ b/test/porousmediumflow/1pnc/1p2c/isothermal/main.cc
@@ -106,7 +106,7 @@ int main(int argc, char** argv)
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
     auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
     vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
diff --git a/test/porousmediumflow/1pnc/1p2c/isothermal/saltwaterintrusion/main.cc b/test/porousmediumflow/1pnc/1p2c/isothermal/saltwaterintrusion/main.cc
index d7b98e5570..22f8bf68d8 100644
--- a/test/porousmediumflow/1pnc/1p2c/isothermal/saltwaterintrusion/main.cc
+++ b/test/porousmediumflow/1pnc/1p2c/isothermal/saltwaterintrusion/main.cc
@@ -98,7 +98,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
     vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
diff --git a/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/main.cc b/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/main.cc
index f950d21134..ef393c2b8c 100644
--- a/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/main.cc
+++ b/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/main.cc
@@ -106,7 +106,7 @@ int main(int argc, char** argv)
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
     auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
     vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
diff --git a/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/problem.hh b/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/problem.hh
index 911464a505..cf7fbd5f2d 100644
--- a/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/problem.hh
+++ b/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/problem.hh
@@ -111,7 +111,7 @@ public:
         return temperatureExact_;
     }
 
-    //! Udpate the analytical temperature
+    //! Update the analytical temperature
     void updateExactTemperature(const SolutionVector& curSol, Scalar time)
     {
         const auto someElement = *(elements(this->gridGeometry().gridView()).begin());
diff --git a/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/main.cc b/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/main.cc
index 39411732f6..e7dde80489 100644
--- a/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/main.cc
+++ b/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/main.cc
@@ -106,7 +106,7 @@ int main(int argc, char** argv)
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
     auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
     vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
diff --git a/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/main.cc b/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/main.cc
index 321cc5f991..e039b1fd44 100644
--- a/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/main.cc
+++ b/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/main.cc
@@ -106,7 +106,7 @@ int main(int argc, char** argv)
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
     auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
     vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
diff --git a/test/porousmediumflow/1pnc/1p3c/main.cc b/test/porousmediumflow/1pnc/1p3c/main.cc
index 4c255d90b5..40eb842857 100644
--- a/test/porousmediumflow/1pnc/1p3c/main.cc
+++ b/test/porousmediumflow/1pnc/1p3c/main.cc
@@ -100,7 +100,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
     vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
diff --git a/test/porousmediumflow/1pnc/dispersion/main.cc b/test/porousmediumflow/1pnc/dispersion/main.cc
index 2c93183e28..68c9e97df6 100644
--- a/test/porousmediumflow/1pnc/dispersion/main.cc
+++ b/test/porousmediumflow/1pnc/dispersion/main.cc
@@ -104,7 +104,7 @@ int main(int argc, char** argv)
     auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
     vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
diff --git a/test/porousmediumflow/1pnc/nonequilibrium/main.cc b/test/porousmediumflow/1pnc/nonequilibrium/main.cc
index 69c8e50485..06ad770dc6 100644
--- a/test/porousmediumflow/1pnc/nonequilibrium/main.cc
+++ b/test/porousmediumflow/1pnc/nonequilibrium/main.cc
@@ -107,7 +107,7 @@ int main(int argc, char** argv)
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
     auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
      using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/1pnc/nonequilibrium/problem.hh b/test/porousmediumflow/1pnc/nonequilibrium/problem.hh
index 7ac9512bf5..f9a7f81e06 100644
--- a/test/porousmediumflow/1pnc/nonequilibrium/problem.hh
+++ b/test/porousmediumflow/1pnc/nonequilibrium/problem.hh
@@ -46,7 +46,7 @@ namespace Dumux {
  * Initially, the domain is filled with water and a specified nitrogen fraction
  *
  * At the right side warmer water is injected via a Neumann boundary and at the left side
- * Dirichlet values are set to the inital conditions.
+ * Dirichlet values are set to the initial conditions.
  *
  * This problem uses the \ref OnePNCModel model.
  */
diff --git a/test/porousmediumflow/1pncmin/nonisothermal/main.cc b/test/porousmediumflow/1pncmin/nonisothermal/main.cc
index e2fedb8826..ca506426a6 100644
--- a/test/porousmediumflow/1pncmin/nonisothermal/main.cc
+++ b/test/porousmediumflow/1pncmin/nonisothermal/main.cc
@@ -101,7 +101,7 @@ int main(int argc, char** argv)
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
     auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     IOFields::initOutputModule(vtkWriter);
diff --git a/test/porousmediumflow/2p/adaptive/main.cc b/test/porousmediumflow/2p/adaptive/main.cc
index b060c766fb..e1949553fe 100644
--- a/test/porousmediumflow/2p/adaptive/main.cc
+++ b/test/porousmediumflow/2p/adaptive/main.cc
@@ -158,7 +158,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/2p/boxdfm/main.cc b/test/porousmediumflow/2p/boxdfm/main.cc
index 80f6007a39..8911516de3 100644
--- a/test/porousmediumflow/2p/boxdfm/main.cc
+++ b/test/porousmediumflow/2p/boxdfm/main.cc
@@ -112,7 +112,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using VtkOutputModule = BoxDfmVtkOutputModule<GridVariables, SolutionVector, FractureGrid>;
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule vtkWriter(*gridVariables, x, problem->name(), fractureGridAdapter, "", Dune::VTK::nonconforming);
diff --git a/test/porousmediumflow/2p/cornerpoint/main.cc b/test/porousmediumflow/2p/cornerpoint/main.cc
index dd2aa8937c..e6d0cb061f 100644
--- a/test/porousmediumflow/2p/cornerpoint/main.cc
+++ b/test/porousmediumflow/2p/cornerpoint/main.cc
@@ -109,7 +109,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name(),
                                                              "", Dune::VTK::conforming);
diff --git a/test/porousmediumflow/2p/fracture/main.cc b/test/porousmediumflow/2p/fracture/main.cc
index cd6ae15165..cdf25936e5 100644
--- a/test/porousmediumflow/2p/fracture/main.cc
+++ b/test/porousmediumflow/2p/fracture/main.cc
@@ -96,7 +96,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/2p/incompressible/main.cc b/test/porousmediumflow/2p/incompressible/main.cc
index 21010f8def..dafa6cbf2b 100644
--- a/test/porousmediumflow/2p/incompressible/main.cc
+++ b/test/porousmediumflow/2p/incompressible/main.cc
@@ -121,7 +121,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
 
     // use non-conforming output for the test with interface solver
diff --git a/test/porousmediumflow/2p/nonisothermal/main.cc b/test/porousmediumflow/2p/nonisothermal/main.cc
index b62477c03f..17af9f1b37 100644
--- a/test/porousmediumflow/2p/nonisothermal/main.cc
+++ b/test/porousmediumflow/2p/nonisothermal/main.cc
@@ -100,7 +100,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/2p1c/main.cc b/test/porousmediumflow/2p1c/main.cc
index e0a5bfac07..e70f4b7c56 100644
--- a/test/porousmediumflow/2p1c/main.cc
+++ b/test/porousmediumflow/2p1c/main.cc
@@ -104,7 +104,7 @@ int main(int argc, char** argv)
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
     auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     IOFields::initOutputModule(vtkWriter); // Add model specific output fields
diff --git a/test/porousmediumflow/2p1c/problem.hh b/test/porousmediumflow/2p1c/problem.hh
index b0180021d1..3d772fe4c5 100644
--- a/test/porousmediumflow/2p1c/problem.hh
+++ b/test/porousmediumflow/2p1c/problem.hh
@@ -6,7 +6,7 @@
  *   This program is free software: you can redistribute it and/or modify    *
  *   it under the terms of the GNU General Public License as published by    *
  *   the Free Software Foundation, either version 3 of the License, or       *
- *   (at your option) any later vesion.                                      *
+ *   (at your option) any later version.                                      *
  *                                                                           *
  *   This program is distributed in the hope that it will be useful,         *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of          *
diff --git a/test/porousmediumflow/2p1c/properties.hh b/test/porousmediumflow/2p1c/properties.hh
index dfccc6fea4..9c90aea496 100644
--- a/test/porousmediumflow/2p1c/properties.hh
+++ b/test/porousmediumflow/2p1c/properties.hh
@@ -6,7 +6,7 @@
  *   This program is free software: you can redistribute it and/or modify    *
  *   it under the terms of the GNU General Public License as published by    *
  *   the Free Software Foundation, either version 3 of the License, or       *
- *   (at your option) any later vesion.                                      *
+ *   (at your option) any later version.                                      *
  *                                                                           *
  *   This program is distributed in the hope that it will be useful,         *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of          *
diff --git a/test/porousmediumflow/2p2c/chemicalnonequilibrium/main.cc b/test/porousmediumflow/2p2c/chemicalnonequilibrium/main.cc
index ed4b9d6869..3f610a1258 100644
--- a/test/porousmediumflow/2p2c/chemicalnonequilibrium/main.cc
+++ b/test/porousmediumflow/2p2c/chemicalnonequilibrium/main.cc
@@ -102,7 +102,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/2p2c/evaporation/main.cc b/test/porousmediumflow/2p2c/evaporation/main.cc
index 9cc569510e..f5073314d3 100644
--- a/test/porousmediumflow/2p2c/evaporation/main.cc
+++ b/test/porousmediumflow/2p2c/evaporation/main.cc
@@ -92,7 +92,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
     vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
diff --git a/test/porousmediumflow/2p2c/injection/main.cc b/test/porousmediumflow/2p2c/injection/main.cc
index c54d287c45..87a86d2fcb 100644
--- a/test/porousmediumflow/2p2c/injection/main.cc
+++ b/test/porousmediumflow/2p2c/injection/main.cc
@@ -113,7 +113,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/2p2c/mpnccomparison/main.cc b/test/porousmediumflow/2p2c/mpnccomparison/main.cc
index 990a33cd3a..c341055be2 100644
--- a/test/porousmediumflow/2p2c/mpnccomparison/main.cc
+++ b/test/porousmediumflow/2p2c/mpnccomparison/main.cc
@@ -101,7 +101,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/2p2c/waterair/main.cc b/test/porousmediumflow/2p2c/waterair/main.cc
index 0935e31031..28328b13fe 100644
--- a/test/porousmediumflow/2p2c/waterair/main.cc
+++ b/test/porousmediumflow/2p2c/waterair/main.cc
@@ -92,7 +92,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
     vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
diff --git a/test/porousmediumflow/2pnc/diffusion/main.cc b/test/porousmediumflow/2pnc/diffusion/main.cc
index a9d9d50cfe..4cd4e4d849 100644
--- a/test/porousmediumflow/2pnc/diffusion/main.cc
+++ b/test/porousmediumflow/2pnc/diffusion/main.cc
@@ -99,7 +99,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/2pncmin/nonisothermal/problem.hh b/test/porousmediumflow/2pncmin/nonisothermal/problem.hh
index 1d6fba8ab4..de2574950f 100644
--- a/test/porousmediumflow/2pncmin/nonisothermal/problem.hh
+++ b/test/porousmediumflow/2pncmin/nonisothermal/problem.hh
@@ -120,7 +120,7 @@ public:
         //problem
         name_ = getParam<std::string>("Problem.Name");
 
-        //inital conditions
+        //initial conditions
         initPressure_      = getParam<Scalar>("Problem.InitialPressure");
         initGasSaturation_      = getParam<Scalar>("Problem.InitialGasSaturation");
         initSalinity_          = getParam<Scalar>("Problem.InitialSalinity");
@@ -335,7 +335,7 @@ public:
         Scalar moleFracNaCl_Max_wPhase = massToMoleFrac_(massFracNaCl_Max_wPhase);
         Scalar saltPorosity = this->spatialParams().minimalPorosity(element, scv);
 
-        // precipitation of amount of salt whic hexeeds the solubility limit
+        // precipitation of amount of salt which hexeeds the solubility limit
         using std::abs;
         Scalar precipSalt = volVars.porosity() * volVars.molarDensity(liquidPhaseIdx)
                                                * volVars.saturation(liquidPhaseIdx)
diff --git a/test/porousmediumflow/2pncmin/nonisothermal/spatialparams.hh b/test/porousmediumflow/2pncmin/nonisothermal/spatialparams.hh
index 21b193aff4..76a9e16c5c 100644
--- a/test/porousmediumflow/2pncmin/nonisothermal/spatialparams.hh
+++ b/test/porousmediumflow/2pncmin/nonisothermal/spatialparams.hh
@@ -20,7 +20,7 @@
  * \file
  * \ingroup TwoPNCMinTests
  * \brief Spatial parameters for the salinization problem, where evaporation
- * from a porous medium saturated wit brine and air leads to precipitation of salt.
+ * from a porous medium saturated with brine and air leads to precipitation of salt.
  */
 
 #ifndef DUMUX_SALINIZATION_SPATIAL_PARAMETERS_HH
@@ -36,7 +36,7 @@ namespace Dumux {
 /*!
  * \ingroup TwoPNCMinTests
  * \brief Spatial parameters for the salinization problem, where evaporation
- * from a porous medium saturated wit brine and air leads to precipitation of salt.
+ * from a porous medium saturated with brine and air leads to precipitation of salt.
  */
 template<class GridGeometry, class Scalar>
 class SalinizationSpatialParams
diff --git a/test/porousmediumflow/3p/conduction/main.cc b/test/porousmediumflow/3p/conduction/main.cc
index f072187abf..dd3b35c34a 100644
--- a/test/porousmediumflow/3p/conduction/main.cc
+++ b/test/porousmediumflow/3p/conduction/main.cc
@@ -101,7 +101,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/3p/conduction/problem.hh b/test/porousmediumflow/3p/conduction/problem.hh
index a0031efba9..0943c47af1 100644
--- a/test/porousmediumflow/3p/conduction/problem.hh
+++ b/test/porousmediumflow/3p/conduction/problem.hh
@@ -108,7 +108,7 @@ public:
         return temperatureExact_;
     }
 
-    //! Udpate the analytical temperature
+    //! Update the analytical temperature
     void updateExactTemperature(const SolutionVector& curSol, Scalar time)
     {
         const auto someElement = *(elements(this->gridGeometry().gridView()).begin());
diff --git a/test/porousmediumflow/3p/convection/main.cc b/test/porousmediumflow/3p/convection/main.cc
index 57e3c6231b..c52f2b7578 100644
--- a/test/porousmediumflow/3p/convection/main.cc
+++ b/test/porousmediumflow/3p/convection/main.cc
@@ -100,7 +100,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/3p/convection/problem.hh b/test/porousmediumflow/3p/convection/problem.hh
index 017f215b8c..61105b49cb 100644
--- a/test/porousmediumflow/3p/convection/problem.hh
+++ b/test/porousmediumflow/3p/convection/problem.hh
@@ -123,7 +123,7 @@ public:
         return temperatureExact_;
     }
 
-    //! Udpate the analytical temperature
+    //! Update the analytical temperature
     void updateExactTemperature(const SolutionVector& curSol, Scalar time)
     {
         const auto someElement = *(elements(this->gridGeometry().gridView()).begin());
diff --git a/test/porousmediumflow/3p/infiltration/main.cc b/test/porousmediumflow/3p/infiltration/main.cc
index 3319c5211e..f072bcecbc 100644
--- a/test/porousmediumflow/3p/infiltration/main.cc
+++ b/test/porousmediumflow/3p/infiltration/main.cc
@@ -101,7 +101,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/3p3c/columnxylol/main.cc b/test/porousmediumflow/3p3c/columnxylol/main.cc
index 61175782c2..4c266e9c83 100644
--- a/test/porousmediumflow/3p3c/columnxylol/main.cc
+++ b/test/porousmediumflow/3p3c/columnxylol/main.cc
@@ -101,7 +101,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
@@ -141,7 +141,7 @@ int main(int argc, char** argv)
         timeLoop->advanceTimeStep();
 
         // write vtk output
-        // if episode length was specificied output only at the end of episodes
+        // if episode length was specified output only at the end of episodes
         if (!hasParam("TimeLoop.EpisodeLength") || timeLoop->isCheckPoint() || timeLoop->finished() || timeLoop->timeStepIndex() == 1)
             vtkWriter.write(timeLoop->time());
 
diff --git a/test/porousmediumflow/3p3c/columnxylol/problem.hh b/test/porousmediumflow/3p3c/columnxylol/problem.hh
index b6a464904b..c91f8f5461 100644
--- a/test/porousmediumflow/3p3c/columnxylol/problem.hh
+++ b/test/porousmediumflow/3p3c/columnxylol/problem.hh
@@ -6,7 +6,7 @@
  *   This program is free software: you can redistribute it and/or modify    *
  *   it under the terms of the GNU General Public License as published by    *
  *   the Free Software Foundation, either version 3 of the License, or       *
- *   (at your option) any later vesion.                                      *
+ *   (at your option) any later version.                                      *
  *                                                                           *
  *   This program is distributed in the hope that it will be useful,         *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of          *
diff --git a/test/porousmediumflow/3p3c/infiltration/main.cc b/test/porousmediumflow/3p3c/infiltration/main.cc
index f2facd1039..cc497ba9e3 100644
--- a/test/porousmediumflow/3p3c/infiltration/main.cc
+++ b/test/porousmediumflow/3p3c/infiltration/main.cc
@@ -106,7 +106,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
@@ -146,7 +146,7 @@ int main(int argc, char** argv)
         timeLoop->advanceTimeStep();
 
         // write vtk output
-        // if episode length was specificied output only at the end of episodes
+        // if episode length was specified output only at the end of episodes
         if (!hasParam("TimeLoop.EpisodeLength") || timeLoop->isCheckPoint() || timeLoop->finished() || timeLoop->timeStepIndex() == 1)
             vtkWriter.write(timeLoop->time());
 
diff --git a/test/porousmediumflow/3p3c/kuevette/main.cc b/test/porousmediumflow/3p3c/kuevette/main.cc
index f0bd103f91..78c02e7af7 100644
--- a/test/porousmediumflow/3p3c/kuevette/main.cc
+++ b/test/porousmediumflow/3p3c/kuevette/main.cc
@@ -102,7 +102,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
@@ -142,7 +142,7 @@ int main(int argc, char** argv)
         timeLoop->advanceTimeStep();
 
         // write vtk output
-        // if episode length was specificied output only at the end of episodes
+        // if episode length was specified output only at the end of episodes
         if (!hasParam("TimeLoop.EpisodeLength") || timeLoop->isCheckPoint() || timeLoop->finished() || timeLoop->timeStepIndex() == 1)
             vtkWriter.write(timeLoop->time());
 
diff --git a/test/porousmediumflow/3pwateroil/main.cc b/test/porousmediumflow/3pwateroil/main.cc
index de4674b9ff..b8d71270b6 100644
--- a/test/porousmediumflow/3pwateroil/main.cc
+++ b/test/porousmediumflow/3pwateroil/main.cc
@@ -103,7 +103,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/3pwateroil/problem.hh b/test/porousmediumflow/3pwateroil/problem.hh
index e0c85c9a3b..67253f8c92 100644
--- a/test/porousmediumflow/3pwateroil/problem.hh
+++ b/test/porousmediumflow/3pwateroil/problem.hh
@@ -6,7 +6,7 @@
  *   This program is free software: you can redistribute it and/or modify    *
  *   it under the terms of the GNU General Public License as published by    *
  *   the Free Software Foundation, either version 3 of the License, or       *
- *   (at your option) any later vesion.                                      *
+ *   (at your option) any later version.                                      *
  *                                                                           *
  *   This program is distributed in the hope that it will be useful,         *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of          *
diff --git a/test/porousmediumflow/co2/main.cc b/test/porousmediumflow/co2/main.cc
index 2801e7aab0..5a8df39be2 100644
--- a/test/porousmediumflow/co2/main.cc
+++ b/test/porousmediumflow/co2/main.cc
@@ -102,7 +102,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/co2/spatialparams.hh b/test/porousmediumflow/co2/spatialparams.hh
index 3aa064fb98..6ff2983c07 100644
--- a/test/porousmediumflow/co2/spatialparams.hh
+++ b/test/porousmediumflow/co2/spatialparams.hh
@@ -105,7 +105,7 @@ public:
      * \param scv The sub-control volume inside the element.
      * \param elemSol The solution at the dofs connected to the element.
      *
-     * \return The instrinsic permeability
+     * \return The intrinsic permeability
      */
     template<class ElementSolution>
     PermeabilityType permeability(const Element& element,
diff --git a/test/porousmediumflow/mpnc/2p2ccomparison/main.cc b/test/porousmediumflow/mpnc/2p2ccomparison/main.cc
index 0f781955d9..6d32570198 100644
--- a/test/porousmediumflow/mpnc/2p2ccomparison/main.cc
+++ b/test/porousmediumflow/mpnc/2p2ccomparison/main.cc
@@ -101,7 +101,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/mpnc/kinetic/main.cc b/test/porousmediumflow/mpnc/kinetic/main.cc
index 72f3ebf770..28b65d7094 100644
--- a/test/porousmediumflow/mpnc/kinetic/main.cc
+++ b/test/porousmediumflow/mpnc/kinetic/main.cc
@@ -107,7 +107,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/mpnc/kinetic/problem.hh b/test/porousmediumflow/mpnc/kinetic/problem.hh
index d055479993..b3f30c6dfa 100644
--- a/test/porousmediumflow/mpnc/kinetic/problem.hh
+++ b/test/porousmediumflow/mpnc/kinetic/problem.hh
@@ -21,7 +21,7 @@
  * \ingroup MPNCTests
  * \brief Problem showcasing the capabilities of the kinetic model.
  *
- * The whole domain is porous medium, but the upper half has properties mimicing
+ * The whole domain is porous medium, but the upper half has properties mimicking
  * the ones of a free-flow domain.
  * This way a poor man's coupling approach is accomplished: Without the
  * complications of coupling, the main characteristics of a porous and a free-flow
@@ -308,7 +308,7 @@ private:
         // capillary pressure Params
         FluidState equilibriumFluidState;
 
-        //set saturation to inital values, this needs to be done in order for the fluidState to tell me pc
+        //set saturation to initial values, this needs to be done in order for the fluidState to tell me pc
         for (int phaseIdx = 0; phaseIdx < numPhases ; ++phaseIdx)
         {
             equilibriumFluidState.setSaturation(phaseIdx, S[phaseIdx]);
@@ -322,7 +322,7 @@ private:
 
         Scalar p[numPhases];
         if (this->spatialParams().inPM_(globalPos)){
-            // Use homogenous pressure in the domain and let the newton find the pressure distribution
+            // Use homogeneous pressure in the domain and let the newton find the pressure distribution
             using std::abs;
             p[liquidPhaseIdx] = pnInitial_  - abs(capPress[liquidPhaseIdx]);
             p[gasPhaseIdx] = p[liquidPhaseIdx] + abs(capPress[liquidPhaseIdx]);
diff --git a/test/porousmediumflow/mpnc/obstacle/main.cc b/test/porousmediumflow/mpnc/obstacle/main.cc
index 0f781955d9..6d32570198 100644
--- a/test/porousmediumflow/mpnc/obstacle/main.cc
+++ b/test/porousmediumflow/mpnc/obstacle/main.cc
@@ -101,7 +101,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/mpnc/thermalnonequilibrium/main.cc b/test/porousmediumflow/mpnc/thermalnonequilibrium/main.cc
index 0af1e4c019..af9fafb9a2 100644
--- a/test/porousmediumflow/mpnc/thermalnonequilibrium/main.cc
+++ b/test/porousmediumflow/mpnc/thermalnonequilibrium/main.cc
@@ -106,7 +106,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/richards/analytical/RichardsAnalytical.m b/test/porousmediumflow/richards/analytical/RichardsAnalytical.m
index e32f82e262..28ef26559e 100644
--- a/test/porousmediumflow/richards/analytical/RichardsAnalytical.m
+++ b/test/porousmediumflow/richards/analytical/RichardsAnalytical.m
@@ -37,7 +37,7 @@ p_w=pwBottom+0.5*(pwTop-pwBottom)*(1+tanh(5*globalPos1-15+time/10));
 
 %% Sättigung
 %S_w=0.7;
-%S_w=(p_n-p_w-MaxPc)/(EntryPc-MaxPc);        %Lineares Modell
+%S_w=(p_n-p_w-MaxPc)/(EntryPc-MaxPc);        %Lineares Model
 %S_w=((p_n-p_w)/p_d)^(-lambda));              %Brooks-Corey-Modell nicht regularisiert
 
 % S_w=@(p_w) ( ...
@@ -67,7 +67,7 @@ S_w=@(p_c) ( ...
 ezplot(S_w,[0,5000]);
 %% Permeabilität
 %Krw=max(min(S_w,1.0),0.0);
-%K=K_int*S_w;                          %Lineares Modell
+%K=K_int*S_w;                          %Lineares Model
 K=K_int*S_w(p_c)^(2/lambda+3);              %Brooks-Corey-Modell
 
 %% Richards-Quellterm
diff --git a/test/porousmediumflow/richards/analytical/main.cc b/test/porousmediumflow/richards/analytical/main.cc
index 07c2a6d85d..4020bc7703 100644
--- a/test/porousmediumflow/richards/analytical/main.cc
+++ b/test/porousmediumflow/richards/analytical/main.cc
@@ -101,7 +101,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/richards/annulus/problem.hh b/test/porousmediumflow/richards/annulus/problem.hh
index 4943b6c5f9..1996c5f8f4 100644
--- a/test/porousmediumflow/richards/annulus/problem.hh
+++ b/test/porousmediumflow/richards/annulus/problem.hh
@@ -70,10 +70,10 @@ public:
         outerRadius_ = gridGeometry->bBoxMax()[0];
 
         // boundary conditions (volumetric flow rate in m^2/s, pressure/psi in Pa)
-        const auto fi = getParam<Scalar>("Problem.InnerFlux", 0.1); // positive means outflow (cm/day)
-        innerFlowRate_ = fi*2*M_PI*innerRadius_*0.01/(24*60*60);
-        const auto fo = getParam<Scalar>("Problem.OuterFlux", 0.0); // positive means outflow (cm/day)
-        outerFlowRate_ = fo*2*M_PI*outerRadius_*0.01/(24*60*60);
+        const auto innerFlux = getParam<Scalar>("Problem.InnerFlux", 0.1); // positive means outflow (cm/day)
+        innerFlowRate_ = innerFlux*2*M_PI*innerRadius_*0.01/(24*60*60);
+        const auto outerFlux = getParam<Scalar>("Problem.OuterFlux", 0.0); // positive means outflow (cm/day)
+        outerFlowRate_ = outerFlux*2*M_PI*outerRadius_*0.01/(24*60*60);
 
         const auto innerPressureHead = getParam<Scalar>("Problem.InnerPressureHeadInCm", -15000);
         const auto innerPressure = headToPressure(innerPressureHead);
diff --git a/test/porousmediumflow/richards/benchmarks/analytical.hh b/test/porousmediumflow/richards/benchmarks/analytical.hh
index 3579e80dc3..e818469ba4 100644
--- a/test/porousmediumflow/richards/benchmarks/analytical.hh
+++ b/test/porousmediumflow/richards/benchmarks/analytical.hh
@@ -171,7 +171,7 @@ private:
         return (waterContentSurface_ - waterContentInitial_)*integral(waterContent);
     }
 
-    // tranformed coordinate
+    // transformed coordinate
     double eta(double x /*in cm*/, double t /*in days*/) const
     {
         return std::fabs(x) - (conductivitySurface_ - conductivityInitial_)/(waterContentSurface_ - waterContentInitial_)*t;
diff --git a/test/porousmediumflow/richards/benchmarks/main.cc b/test/porousmediumflow/richards/benchmarks/main.cc
index 8eb769ce7f..45376d73a9 100644
--- a/test/porousmediumflow/richards/benchmarks/main.cc
+++ b/test/porousmediumflow/richards/benchmarks/main.cc
@@ -90,7 +90,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     auto vtkWriter = std::make_shared<VtkOutputModule<GridVariables, SolutionVector>>(*gridVariables, x, problem->name());
     vtkWriter->addVolumeVariable([](const auto& volVars){ return volVars.saturation(0)*volVars.porosity(); }, "water content");
     vtkWriter->addVolumeVariable([](const auto& volVars){ return volVars.saturation(0); }, "saturation");
diff --git a/test/porousmediumflow/richards/lens/main.cc b/test/porousmediumflow/richards/lens/main.cc
index 07a35d4744..2eab7634ba 100644
--- a/test/porousmediumflow/richards/lens/main.cc
+++ b/test/porousmediumflow/richards/lens/main.cc
@@ -127,7 +127,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/richards/nonisothermal/conduction/main.cc b/test/porousmediumflow/richards/nonisothermal/conduction/main.cc
index e9b8b4c8d7..9b90071bf1 100644
--- a/test/porousmediumflow/richards/nonisothermal/conduction/main.cc
+++ b/test/porousmediumflow/richards/nonisothermal/conduction/main.cc
@@ -101,7 +101,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/richards/nonisothermal/conduction/problem.hh b/test/porousmediumflow/richards/nonisothermal/conduction/problem.hh
index 4543fb48e2..5ee04f58fa 100644
--- a/test/porousmediumflow/richards/nonisothermal/conduction/problem.hh
+++ b/test/porousmediumflow/richards/nonisothermal/conduction/problem.hh
@@ -106,7 +106,7 @@ public:
         return temperatureExact_;
     }
 
-  //! Udpate the analytical temperature
+  //! Update the analytical temperature
     void updateExactTemperature(const SolutionVector& curSol, Scalar time)
     {
         const auto someElement = *(elements(this->gridGeometry().gridView()).begin());
diff --git a/test/porousmediumflow/richards/nonisothermal/convection/main.cc b/test/porousmediumflow/richards/nonisothermal/convection/main.cc
index e9b8b4c8d7..9b90071bf1 100644
--- a/test/porousmediumflow/richards/nonisothermal/convection/main.cc
+++ b/test/porousmediumflow/richards/nonisothermal/convection/main.cc
@@ -101,7 +101,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/richards/nonisothermal/evaporation/main.cc b/test/porousmediumflow/richards/nonisothermal/evaporation/main.cc
index 257a6e8c90..46649d25ed 100644
--- a/test/porousmediumflow/richards/nonisothermal/evaporation/main.cc
+++ b/test/porousmediumflow/richards/nonisothermal/evaporation/main.cc
@@ -101,7 +101,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/richardsnc/main.cc b/test/porousmediumflow/richardsnc/main.cc
index 1c554e5ce8..d37ac9f3bd 100644
--- a/test/porousmediumflow/richardsnc/main.cc
+++ b/test/porousmediumflow/richardsnc/main.cc
@@ -102,7 +102,7 @@ int main(int argc, char** argv)
     const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
     auto dt = getParam<Scalar>("TimeLoop.DtInitial");
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
diff --git a/test/porousmediumflow/solidenergy/main.cc b/test/porousmediumflow/solidenergy/main.cc
index c76522c00c..af34844b23 100644
--- a/test/porousmediumflow/solidenergy/main.cc
+++ b/test/porousmediumflow/solidenergy/main.cc
@@ -98,7 +98,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields
diff --git a/test/porousmediumflow/tracer/2ptracer/main.cc b/test/porousmediumflow/tracer/2ptracer/main.cc
index e539e0afac..f1633ed7f1 100644
--- a/test/porousmediumflow/tracer/2ptracer/main.cc
+++ b/test/porousmediumflow/tracer/2ptracer/main.cc
@@ -115,7 +115,7 @@ int main(int argc, char** argv)
     auto twoPGridVariables = std::make_shared<TwoPGridVariables>(twoPProblem, gridGeometry);
     twoPGridVariables->init(p);
 
-    // intialize the vtk output module
+    // initialize the vtk output module
     using TwoPIOFields = GetPropType<TwoPTypeTag, Properties::IOFields>;
 
     // use non-conforming output for the test with interface solver
diff --git a/test/porousmediumflow/tracer/constvel/main.cc b/test/porousmediumflow/tracer/constvel/main.cc
index 037e080c0f..c2a782a5ff 100644
--- a/test/porousmediumflow/tracer/constvel/main.cc
+++ b/test/porousmediumflow/tracer/constvel/main.cc
@@ -119,7 +119,7 @@ int main(int argc, char** argv)
     assembler->assembleJacobianAndResidual(x);
     solver.reuseMatrix();
 
-    //! intialize the vtk output module
+    //! initialize the vtk output module
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
     vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
diff --git a/test/porousmediumflow/tracer/multiphase/main.cc b/test/porousmediumflow/tracer/multiphase/main.cc
index a1989b15d9..d6b9aa0b46 100644
--- a/test/porousmediumflow/tracer/multiphase/main.cc
+++ b/test/porousmediumflow/tracer/multiphase/main.cc
@@ -93,7 +93,7 @@ int main(int argc, char** argv)
     auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
-    //! intialize the vtk output module
+    //! initialize the vtk output module
     VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
     using VelocityOutput = GetPropType<TypeTag, Properties::VelocityOutput>;
     vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables));
-- 
GitLab