diff --git a/applications/utilities/preProcessing/PDR/pdrFields/PDRparams.C b/applications/utilities/preProcessing/PDR/pdrFields/PDRparams.C
index 921716621a..fd4a5bf079 100644
--- a/applications/utilities/preProcessing/PDR/pdrFields/PDRparams.C
+++ b/applications/utilities/preProcessing/PDR/pdrFields/PDRparams.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +54,7 @@ void Foam::PDRparams::readDefaults(const dictionary& dict)
 
     outer_orthog = dict.found("outer_orthog");
 
-    dict.readIfPresent("debugLevel", debugLevel);
+    dict.readIfPresent("debug.level", debugLevel);
     dict.readIfPresent("nFacesToBlockC", nFacesToBlockC);
     dict.readIfPresent("nPairsToBlockC", nPairsToBlockC);
     dict.readIfPresent("overlaps", overlaps);
diff --git a/src/OpenFOAM/expressions/exprDriver/exprDriver.C b/src/OpenFOAM/expressions/exprDriver/exprDriver.C
index d28d84d735..319c625e6d 100644
--- a/src/OpenFOAM/expressions/exprDriver/exprDriver.C
+++ b/src/OpenFOAM/expressions/exprDriver/exprDriver.C
@@ -189,8 +189,8 @@ Foam::expressions::exprDriver::exprDriver
     stashedTokenId_(0),
 
     // Controls
-    debugScanner_(dict.getOrDefault("debugScanner", false)),
-    debugParser_(dict.getOrDefault("debugParser", false)),
+    debugScanner_(dict.getOrDefault("debug.scanner", false)),
+    debugParser_(dict.getOrDefault("debug.parser", false)),
     allowShadowing_(dict.getOrDefault("allowShadowing", false)),
     prevIterIsOldTime_(dict.getOrDefault("prevIterIsOldTime", false)),
     searchCtrl_(search)
@@ -298,7 +298,7 @@ bool Foam::expressions::exprDriver::readDict
     const dictionary& dict
 )
 {
-    dict.readIfPresent("debugBaseDriver", debug);
+    dict.readIfPresent("debug.driver", debug);
 
     // Regular variables
     variableStrings_ = readVariableStrings(dict);
diff --git a/src/OpenFOAM/expressions/exprDriver/exprDriver.H b/src/OpenFOAM/expressions/exprDriver/exprDriver.H
index 3db249aff8..c1973366eb 100644
--- a/src/OpenFOAM/expressions/exprDriver/exprDriver.H
+++ b/src/OpenFOAM/expressions/exprDriver/exprDriver.H
@@ -43,10 +43,10 @@ Description
 
     Debug Properties
     \table
-        Property     | Description                          | Required | Default
-        debugBaseDriver | Debug level (int) for base driver | no  |
-        debugScanner | Add debug for scanner                | no  | false
-        debugParser  | Add debug for parser                 | no  | false
+        Property      | Description                         | Required | Default
+        debug.driver  | Debug level (int) for base driver   | no  |
+        debug.scanner | Add debug for scanner               | no  | false
+        debug.parser  | Add debug for parser                | no  | false
     \endtable
 
     The \c lookup<scalar> and \c lookup<vector> are dictionaries
diff --git a/src/finiteVolume/expressions/base/fvExprDriver.H b/src/finiteVolume/expressions/base/fvExprDriver.H
index 1ecd04caa5..dd485d4dbc 100644
--- a/src/finiteVolume/expressions/base/fvExprDriver.H
+++ b/src/finiteVolume/expressions/base/fvExprDriver.H
@@ -44,10 +44,10 @@ Description
 
     Debug Properties
     \table
-        Property     | Description                          | Required | Default
-        debugBaseDriver | Debug level (int) for base driver | no  |
-        debugScanner | Add debug for scanner                | no  | false
-        debugParser  | Add debug for parser                 | no  | false
+        Property      | Description                         | Required | Default
+        debug.driver  | Debug level (int) for base driver   | no  |
+        debug.scanner | Add debug for scanner               | no  | false
+        debug.parser  | Add debug for parser                | no  | false
     \endtable
 
 SourceFiles
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/p b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/p
index af87af3557..2ba3f62e72 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2106                                 |
+|  \\    /   O peration     | Version:  v2112                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -42,17 +42,17 @@ boundaryField
     {
         type            exprFixedValue;
         value           $internalField;
+        // debug           true;
+        // debug.scanner   true;
+        // debug.parser    true;
 
-        valueExpr      "0.5*(pInlet + pOutlet2)";
         variables
         (
             "pInlet{inlet} = weightAverage(p)"
             "pOutlet2{outlet2} = p"
         );
 
-        // debug           true;
-        // debugScanner    true;
-        // debugParser     true;
+        valueExpr      "0.5*(pInlet + pOutlet2)";
     }
 
     outlet2
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/README.md b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/README.md
index 5cda368f0b..29db4ef29c 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/README.md
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/TJunctionAverage/README.md
@@ -1,4 +1,5 @@
-- 15/8/8 Simple T-junction.
+## Simple T-junction.
+
 - Inlet on left, one outlet at bottom, one at top.
 - To test multiple outlets.
-- Enable debugScanner/debugParser for a verbose view of the parsing engine.
+- Enable debug.scanner/debug.parser for a verbose view of the parsing engine.