diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
index 29a92e19f8e69108173f272b3dff84e298a38fbd..d8fd2dd5e30b0b3bf8c6bf25d8d7fd8cbc00a621 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
@@ -52,7 +52,7 @@ Foam::autoPtr<Foam::PDRDragModel> Foam::PDRDragModel::New
         )   << "Unknown PDRDragModel type "
             << PDRDragModelTypeName << endl << endl
             << "Valid  PDRDragModels are : " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C
index 43515c6baebe049e00fae4a5fe3054ca2731f803..f0bc471c911c12164af98e32335e1f79a389eb0a 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C
@@ -56,7 +56,7 @@ Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
         )   << "Unknown XiEqModel type "
             << XiEqModelTypeName << endl << endl
             << "Valid  XiEqModels are : " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C
index 780bc8418de58f3a182c487061ef9aea91bd1386..81f5cca253a4c6344b1726ecde0138562996bffe 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C
@@ -56,7 +56,7 @@ Foam::autoPtr<Foam::XiGModel> Foam::XiGModel::New
         )   << "Unknown XiGModel type "
             << XiGModelTypeName << endl << endl
             << "Valid  XiGModels are : " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C
index fd1e25de9b2bacedba7b3e95834eb0d74e69a3d7..2dc8dac138c0111d7f730b4aad4b03cf5e772150 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C
@@ -54,7 +54,7 @@ Foam::autoPtr<Foam::XiModel> Foam::XiModel::New
         )   << "Unknown XiModel type "
             << XiModelTypeName << endl << endl
             << "Valid  XiModels are : " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
index 3def1c64fcbe9fc75b56cdd9a826e7318f95d703..227f76c4c78ea3110c43bde8bbfda950b9cf77c2 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
@@ -70,7 +70,7 @@ Foam::phaseChangeTwoPhaseMixture::New
         )   << "Unknown phaseChangeTwoPhaseMixture type "
             << phaseChangeTwoPhaseMixtureTypeName << endl << endl
             << "Valid  phaseChangeTwoPhaseMixtures are : " << endl
-            << componentsConstructorTablePtr_->toc()
+            << componentsConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
index 68bb43a38555b6934acd1e14b49cd44d957e57c8..582fa4cdd352671c1c1b4cfabc87c8b3ec633509 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
@@ -57,7 +57,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
                 << dragModelType
                 << ", constructor not in hash table" << endl << endl
                 << "    Valid dragModel types are : " << endl;
-        Info << dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info << dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return cstrIter()(interfaceDict, alpha, phasea, phaseb);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
index 0ea5d053b9860513d28d7ef6cb2bf3fb57627274..e5d27350b3586db704ed0e4727de79f5e3ccdaa1 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::conductivityModel> Foam::conductivityModel::New
             << conductivityModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid conductivityModelType types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<conductivityModel>(cstrIter()(dict));
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
index 96315e8c201ab938c0f4e4c00e572eda60340585..fed001e0c067a56935be54506277aa340fb0deee 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::frictionalStressModel> Foam::frictionalStressModel::New
             << frictionalStressModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid frictionalStressModelType types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<frictionalStressModel>(cstrIter()(dict));
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
index 0df3d38613882f1964c0291ed3147cbccad3bdfd..cda9814b46ed2a7760673a5e445cc7fa60bfe528 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::granularPressureModel> Foam::granularPressureModel::New
             << granularPressureModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid granularPressureModelType types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<granularPressureModel>(cstrIter()(dict));
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
index 9e107809bf34ec9c89479eba0d3e0c47b985bb97..fc6b2ed5d9612f401f05b779a0625cf67fa0b756 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::radialModel> Foam::radialModel::New
             << radialModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid radialModelType types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<radialModel>(cstrIter()(dict));
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
index 508673a5d32c9b416557591b11cbdba3b88ad8d0..5de17ec189bd93529f211523b3faf0d6b91f4987 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
@@ -50,7 +50,7 @@ Foam::kineticTheoryModels::viscosityModel::New
             << viscosityModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid viscosityModelType types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<viscosityModel>(cstrIter()(dict));
diff --git a/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdge.C b/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdge.C
index 6a2d41a83e31af8d938cfb8bc1a4bccdffd532b7..9329c33f6db948de38c13d8e548a334d8649f61e 100644
--- a/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdge.C
+++ b/applications/utilities/mesh/generation/blockMesh/curvedEdges/curvedEdge.C
@@ -107,7 +107,7 @@ autoPtr<curvedEdge> curvedEdge::New(const pointField& points, Istream& is)
         FatalErrorIn("curvedEdge::New(const pointField&, Istream&)")
             << "Unknown curvedEdge type " << curvedEdgeType << endl << endl
             << "Valid curvedEdge types are" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << abort(FatalError);
     }
 
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/newExtrudeModel.C b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/newExtrudeModel.C
index 967481cff9c0eeea9641c78409ac992233f101cc..e511ef9082d64e4ab36513fd1160f2674ab0818d 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/newExtrudeModel.C
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/extrudeModel/newExtrudeModel.C
@@ -47,7 +47,7 @@ Foam::autoPtr<Foam::extrudeModel> Foam::extrudeModel::New
             << extrudeModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid extrudeModel types are :" << nl
-            << dictionaryConstructorTablePtr_->toc() << nl
+            << dictionaryConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
diff --git a/src/ODE/ODESolvers/ODESolver/newODESolver.C b/src/ODE/ODESolvers/ODESolver/newODESolver.C
index f10bf0bbd13aceb334867c509b0eee059573d69f..9f3472ce0c0e664b6e8c37e661092500609aa121 100644
--- a/src/ODE/ODESolvers/ODESolver/newODESolver.C
+++ b/src/ODE/ODESolvers/ODESolver/newODESolver.C
@@ -47,7 +47,7 @@ Foam::autoPtr<Foam::ODESolver> Foam::ODESolver::New
         )   << "Unknown ODESolver type "
             << ODESolverTypeName << endl << endl
             << "Valid  ODESolvers are : " << endl
-            << ODEConstructorTablePtr_->toc()
+            << ODEConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/OpenFOAM/db/IOstreams/token/token.C b/src/OpenFOAM/db/IOstreams/token/token.C
index f74dbd7381eaee285962b76fbc9896fe4ccf8345..271ec286a7ecfc58d4920c0a0783aa3d399f02b8 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.C
+++ b/src/OpenFOAM/db/IOstreams/token/token.C
@@ -67,7 +67,7 @@ Foam::autoPtr<Foam::token::compound> Foam::token::compound::New
         FatalErrorIn("token::compound::New(const word&, Istream&)")
             << "Unknown compound type " << compoundType << nl << nl
             << "Valid compound types:" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << abort(FatalError);
     }
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
index 3157cea04bb4dfcc8f5ef70dcc0b49fa984af62b..b07f5d790dcd2623c29f18d7f7b68ae37e45ab00 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
@@ -89,7 +89,7 @@ Foam::autoPtr<Foam::functionObject> Foam::functionObject::New
         )   << "Unknown function type "
             << functionType << nl << nl
             << "Valid functions are : " << nl
-            << dictionaryConstructorTablePtr_->toc() << endl
+            << dictionaryConstructorTablePtr_->sortedToc() << endl
             << exit(FatalError);
     }
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/newPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/newPointPatchField.C
index 0669f0e79653094ab2b5180c9375fcd14dcd5b41..8efa87c3ecd508c24b49570e7c13b6ba6ba4a814 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/newPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/newPointPatchField.C
@@ -55,7 +55,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
             << patchFieldType
             << endl << endl
             << "Valid patchField types are :" << endl
-            << pointPatchConstructorTablePtr_->toc()
+            << pointPatchConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
@@ -111,7 +111,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
             )   << "Unknown patchField type " << patchFieldType
                 << " for patch type " << p.type() << endl << endl
                 << "Valid patchField types are :" << endl
-                << dictionaryConstructorTablePtr_->toc()
+                << dictionaryConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
     }
@@ -182,7 +182,7 @@ Foam::autoPtr<Foam::pointPatchField<Type> > Foam::pointPatchField<Type>::New
         )   << "unknown patchTypefield type "
             << ptf.type() << endl << endl
             << "Valid patchField types are :" << endl
-            << patchMapperConstructorTablePtr_->toc()
+            << patchMapperConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/OpenFOAM/graph/graph.C b/src/OpenFOAM/graph/graph.C
index adb93713338e31a88a354ca61c827d3a4bb8d90a..ed9fde581797c64031520b5f106a7b2526a85b60 100644
--- a/src/OpenFOAM/graph/graph.C
+++ b/src/OpenFOAM/graph/graph.C
@@ -168,7 +168,7 @@ autoPtr<graph::writer> graph::writer::New(const word& graphFormat)
         )   << "Unknown graph format " << graphFormat
             << endl << endl
             << "Valid graph formats are : " << endl
-            << wordConstructorTablePtr_->toc()
+            << wordConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
index c85cf074bed4be606318581f1f63101024c5999e..aa97913cf0e50510826fbe3d30f49d288c1f4f31 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
@@ -97,7 +97,7 @@ Foam::lduMatrix::preconditioner::New
             )   << "Unknown symmetric matrix preconditioner "
                 << name << nl << nl
                 << "Valid symmetric matrix preconditioners :" << endl
-                << symMatrixConstructorTablePtr_->toc()
+                << symMatrixConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
 
@@ -125,7 +125,7 @@ Foam::lduMatrix::preconditioner::New
             )   << "Unknown asymmetric matrix preconditioner "
                 << name << nl << nl
                 << "Valid asymmetric matrix preconditioners :" << endl
-                << asymMatrixConstructorTablePtr_->toc()
+                << asymMatrixConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
index 4ce5381fb18e76a938cb0dec61c4fdf803f153b3..6f4b38d147d62329717ab1e76d64f98a54dbba73 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
@@ -98,7 +98,7 @@ Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
             )   << "Unknown symmetric matrix smoother "
                 << name << nl << nl
                 << "Valid symmetric matrix smoothers are :" << endl
-                << symMatrixConstructorTablePtr_->toc()
+                << symMatrixConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
 
@@ -127,7 +127,7 @@ Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
             )   << "Unknown asymmetric matrix smoother "
                 << name << nl << nl
                 << "Valid asymmetric matrix smoothers are :" << endl
-                << asymMatrixConstructorTablePtr_->toc()
+                << asymMatrixConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
index cb17295a3ef73853e0c63fcc3481c70f883fdbca..0114c0f08a9010cdc9f48cd118e4936bde3d562f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
@@ -77,7 +77,7 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
                 "lduMatrix::solver::New", solverControls
             )   << "Unknown symmetric matrix solver " << name << nl << nl
                 << "Valid symmetric matrix solvers are :" << endl
-                << symMatrixConstructorTablePtr_->toc()
+                << symMatrixConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
 
@@ -106,7 +106,7 @@ Foam::autoPtr<Foam::lduMatrix::solver> Foam::lduMatrix::solver::New
                 "lduMatrix::solver::New", solverControls
             )   << "Unknown asymmetric matrix solver " << name << nl << nl
                 << "Valid asymmetric matrix solvers are :" << endl
-                << asymMatrixConstructorTablePtr_->toc()
+                << asymMatrixConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
index 633b8e2f37adbe55e66975642a62db9ee80e61cd..47e1d4dbd3a9f0e59b9d9c9d27700f64de4fbcfb 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
@@ -124,9 +124,9 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
             )   << "Unknown GAMGAgglomeration type "
                 << agglomeratorType << ".\n"
                 << "Valid algebraic GAMGAgglomeration types are :"
-                << lduMatrixConstructorTablePtr_->toc() << endl
+                << lduMatrixConstructorTablePtr_->sortedToc() << endl
                 << "Valid algebraic GAMGAgglomeration types are :"
-                << lduMeshConstructorTablePtr_->toc()
+                << lduMeshConstructorTablePtr_->sortedToc()
                 << exit(FatalError);
         }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/newGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/newGAMGInterfaceField.C
index 61251878c14973e6c6ba6c69b58341e99583327a..a083dcae540e55f32b923bec394c5310e7d887f8 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/newGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/GAMGInterfaceField/newGAMGInterfaceField.C
@@ -48,7 +48,7 @@ Foam::autoPtr<Foam::GAMGInterfaceField> Foam::GAMGInterfaceField::New
             "const lduInterfaceField& fineInterface)"
         )   << "Unknown GAMGInterfaceField type " << coupleType << ".\n"
             << "Valid GAMGInterfaceField types are :"
-            << lduInterfaceConstructorTablePtr_->toc()
+            << lduInterfaceConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/newGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/newGAMGInterface.C
index 196a91f0c462bcca698b1543e5ae40ae9c2efd98..7cb1ecf147b5be5760270b537cdc23fe24e649a0 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/newGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/newGAMGInterface.C
@@ -52,7 +52,7 @@ Foam::autoPtr<Foam::GAMGInterface> Foam::GAMGInterface::New
             "const labelField& neighbourRestrictAddressing)"
         )   << "Unknown GAMGInterface type " << coupleType << ".\n"
             << "Valid GAMGInterface types are :"
-            << lduInterfaceConstructorTablePtr_->toc()
+            << lduInterfaceConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/newFacePointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/newFacePointPatch.C
index 4e870225e697141e98eaf9f344682ead0334ddc7..4146954746ac6c36b468475a81610bc05a7b4075 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/newFacePointPatch.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/newFacePointPatch.C
@@ -60,7 +60,7 @@ autoPtr<facePointPatch> facePointPatch::New
             << patch.type()
             << endl << endl
             << "Valid facePointPatch types are :" << endl
-            << polyPatchConstructorTablePtr_->toc()
+            << polyPatchConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/newPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/newPolyPatch.C
index f456fc840406753f71db775664f79b068224fa19..deceda1eefe6266fc75faf2433fed15605a7e9d9 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/newPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/newPolyPatch.C
@@ -59,7 +59,7 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
         )   << "Unknown polyPatch type " << patchType << " for patch " << name
             << endl << endl
             << "Valid polyPatch types are :" << endl
-            << wordConstructorTablePtr_->toc()
+            << wordConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
@@ -107,7 +107,7 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
                 << " for patch " << name
                 << endl << endl
                 << "Valid polyPatch types are :" << endl
-                << dictionaryConstructorTablePtr_->toc()
+                << dictionaryConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C
index e71581215026cb5d731eaba549d1e7399efa9079..1905c9beda87ef8ca8be42dddca9b2f227fd3e44 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C
@@ -62,7 +62,7 @@ Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
             dict
         )   << "Unknown cellZone type " << zoneType << endl << endl
             << "Valid cellZone types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C
index 5e77ee77781fb44117a619a5b49fdb5bd86c860c..91506f5ce885005f7e218ecf9edefa7b7eb5c955 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C
@@ -62,7 +62,7 @@ Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
             dict
         )   << "Unknown faceZone type " << zoneType << endl << endl
             << "Valid faceZone types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C
index afdc80e3222f07cccc08c4da561548d25773077f..015bdea31805a935f259a5d883c5a9dee250950f 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C
@@ -62,7 +62,7 @@ Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
             dict
         )   << "Unknown pointZone type " << zoneType << endl << endl
             << "Valid pointZone types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/conversion/ensight/part/ensightPart.C b/src/conversion/ensight/part/ensightPart.C
index c02f6c9896bb1994b898683896e64c61d7bb6402..a8b4e50308d7ae766709bb9aaae0def9cf9a597e 100644
--- a/src/conversion/ensight/part/ensightPart.C
+++ b/src/conversion/ensight/part/ensightPart.C
@@ -142,7 +142,7 @@ Foam::autoPtr<Foam::ensightPart> Foam::ensightPart::New(Istream& is)
             is
         )   << "unknown ensightPart type " << partType << endl << endl
             << "Valid ensightPart types are :" << endl
-            << istreamConstructorTablePtr_->toc()
+            << istreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C
index b526f391ef3d595e93679097f98173a1cdff023a..01b1a56d03f3fe14d6828654fc119b1bf7617f13 100644
--- a/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -64,7 +64,7 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
         )   << "Unknown decompositionMethod "
             << decompositionMethodTypeName << endl << endl
             << "Valid decompositionMethods are : " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
@@ -96,7 +96,7 @@ Foam::autoPtr<Foam::decompositionMethod> Foam::decompositionMethod::New
         )   << "Unknown decompositionMethod "
             << decompositionMethodTypeName << endl << endl
             << "Valid decompositionMethods are : " << endl
-            << dictionaryMeshConstructorTablePtr_->toc()
+            << dictionaryMeshConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/dynamicFvMesh/dynamicFvMesh/newDynamicFvMesh.C b/src/dynamicFvMesh/dynamicFvMesh/newDynamicFvMesh.C
index ca300e4d36c5912482b96c5a0c2b4032f9fccf7e..5dfe589ec3251bae4516f4a23406df46e02b1094 100644
--- a/src/dynamicFvMesh/dynamicFvMesh/newDynamicFvMesh.C
+++ b/src/dynamicFvMesh/dynamicFvMesh/newDynamicFvMesh.C
@@ -79,7 +79,7 @@ Foam::autoPtr<Foam::dynamicFvMesh> Foam::dynamicFvMesh::New(const IOobject& io)
         )   << "Unknown dynamicFvMesh type " << dynamicFvMeshTypeName
             << endl << endl
             << "Valid dynamicFvMesh types are :" << endl
-            << IOobjectConstructorTablePtr_->toc()
+            << IOobjectConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/newSolidBodyMotionFunction.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/newSolidBodyMotionFunction.C
index 11e6e656b3ba7c66b715bd965ba75b65d71e3423..8c9fcbc5229deaaca919c49cfe85eefe9af4d5ca 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/newSolidBodyMotionFunction.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/newSolidBodyMotionFunction.C
@@ -55,7 +55,7 @@ Foam::autoPtr<Foam::solidBodyMotionFunction> Foam::solidBodyMotionFunction::New
         )   << "Unknown solidBodyMotionFunction type "
             << solidBodyMotionFunctionTypeName << endl << endl
             << "Valid  solidBodyMotionFunctions are : " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
index d7cd19583779e248aca5674ecc395342a2eddb9f..83fb08bc5c1a17d2ac93022056c64c8d3eb470bc 100644
--- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
@@ -62,7 +62,7 @@ autoPtr<cellLooper> cellLooper::New
         )   << "Unknown set type " << type
             << endl << endl
             << "Valid cellLooper types : " << endl
-            << wordConstructorTablePtr_->toc()
+            << wordConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/dynamicMesh/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolver/motionSolver.C
index a7a8883371046bcaf7085000206b17fce4672172..5966679feb719ce88d16dcc0c7115f76e849db25 100644
--- a/src/dynamicMesh/motionSolver/motionSolver.C
+++ b/src/dynamicMesh/motionSolver/motionSolver.C
@@ -107,7 +107,7 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New(const polyMesh& mesh)
         )   << "Unknown solver type " << solverTypeName
             << endl << endl
             << "Valid solver types are: " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/newPolyMeshModifier.C b/src/dynamicMesh/polyTopoChange/polyMeshModifier/newPolyMeshModifier.C
index 00547da73bbb3f30dbd2b10b43da8b360de3923b..ca2d7b6826e63985bfc4102376efa09a2467c024 100644
--- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/newPolyMeshModifier.C
+++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/newPolyMeshModifier.C
@@ -64,7 +64,7 @@ autoPtr<polyMeshModifier> polyMeshModifier::New
             dict
         )   << "Unknown polyMeshModifier type " << patchType << endl << endl
             << "Valid polyMeshModifier types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/engine/engineMesh/engineMesh/newEngineMesh.C b/src/engine/engineMesh/engineMesh/newEngineMesh.C
index bf2a6033df25b02d3156b9dc579ef5c7395dc7c2..158db3073e5655a1a993ed0f326691cbe1810d59 100644
--- a/src/engine/engineMesh/engineMesh/newEngineMesh.C
+++ b/src/engine/engineMesh/engineMesh/newEngineMesh.C
@@ -69,7 +69,7 @@ Foam::autoPtr<Foam::engineMesh> Foam::engineMesh::New
         )   << "Unknown engineMesh type " << engineMeshTypeName
             << endl << endl
             << "Valid engineMesh types are :" << endl
-            << IOobjectConstructorTablePtr_->toc()
+            << IOobjectConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C
index ff94172db043b22a9b09bc1c04a363234683b430..cc4400dabac221f0720c081e39c8f757495e633c 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C
@@ -76,7 +76,7 @@ autoPtr<SRFModel> SRFModel::New
         )   << "Unknown SRFModel type " << SRFModelTypeName
             << nl << nl
             << "Valid SRFModel types are :" << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/newFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/newFvPatchField.C
index 59fc3b363350825273474e1aba64ca5a3b9aaedd..3ef0d0e42725f0d4ff380377940aaac0446b2cef 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/newFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/newFvPatchField.C
@@ -54,7 +54,7 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
         )   << "Unknown patchTypefield type " << patchFieldType
             << endl << endl
             << "Valid patchField types are :" << endl
-            << patchConstructorTablePtr_->toc()
+            << patchConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
@@ -111,7 +111,7 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
             )   << "Unknown patchField type " << patchFieldType
                 << " for patch type " << p.type() << endl << endl
                 << "Valid patchField types are :" << endl
-                << dictionaryConstructorTablePtr_->toc()
+                << dictionaryConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
     }
@@ -178,7 +178,7 @@ Foam::tmp<Foam::fvPatchField<Type> > Foam::fvPatchField<Type>::New
             "const fvPatchFieldMapper&)"
         )   << "unknown patchTypefield type " << ptf.type() << endl << endl
             << "Valid patchField types are :" << endl
-            << patchMapperConstructorTablePtr_->toc()
+            << patchMapperConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C
index 38abb38d8c4e4c0c778d3298c69c72d7ada9cafd..d8427a34453dbc3a634d7d17bc0e89eebe99dd8e 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C
@@ -59,7 +59,7 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
         )   << "Unknown patchTypefield type " << patchFieldType
             << endl << endl
             << "Valid patchField types are :" << endl
-            << patchConstructorTablePtr_->toc()
+            << patchConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
@@ -115,7 +115,7 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
             )   << "Unknown patchField type " << patchFieldType
                 << " for patch type " << p.type() << endl << endl
                 << "Valid patchField types are :" << endl
-                << dictionaryConstructorTablePtr_->toc()
+                << dictionaryConstructorTablePtr_->sortedToc()
                 << exit(FatalIOError);
         }
     }
@@ -183,7 +183,7 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
             "const fvPatchFieldMapper&)"
         )   << "unknown patchTypefield type " << ptf.type() << endl << endl
             << "Valid patchField types are :" << endl
-            << patchMapperConstructorTablePtr_->toc()
+            << patchMapperConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
index 1a8947cd8c710c9f089619a77fa8b080ef3ecca5..ce5c19d791d799cb389ca4323cea210f1bed6a3d 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
@@ -79,7 +79,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
             schemeData
         )   << "Convection scheme not specified" << endl << endl
             << "Valid convection schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -97,7 +97,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
             schemeData
         )   << "unknown convection scheme " << schemeName << endl << endl
             << "Valid convection schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -136,7 +136,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
             schemeData
         )   << "Convection scheme not specified" << endl << endl
             << "Valid convection schemes are :" << endl
-            << MultivariateConstructorTablePtr_->toc()
+            << MultivariateConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -156,7 +156,7 @@ tmp<convectionScheme<Type> > convectionScheme<Type>::New
             schemeData
         )   << "unknown convection scheme " << schemeName << endl << endl
             << "Valid convection schemes are :" << endl
-            << MultivariateConstructorTablePtr_->toc()
+            << MultivariateConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
index 9783d2694d2122803996717867ad55264951e1ef..0018817c685940f463dba9a169d84f12439a8c41 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
@@ -64,7 +64,7 @@ tmp<d2dt2Scheme<Type> > d2dt2Scheme<Type>::New
             schemeData
         )   << "D2dt2 scheme not specified" << endl << endl
             << "Valid d2dt2 schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -81,7 +81,7 @@ tmp<d2dt2Scheme<Type> > d2dt2Scheme<Type>::New
             schemeData
         )   << "unknown d2dt2 scheme " << schemeName << endl << endl
             << "Valid d2dt2 schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
index 854060453fed8ea7b74ff46b4fc397df48ed13fd..80d47fe830d63cd584b3eafdbdd175995d36ecee 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
@@ -62,7 +62,7 @@ tmp<ddtScheme<Type> > ddtScheme<Type>::New
             schemeData
         )   << "Ddt scheme not specified" << endl << endl
             << "Valid ddt schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -79,7 +79,7 @@ tmp<ddtScheme<Type> > ddtScheme<Type>::New
             schemeData
         )   << "unknown ddt scheme " << schemeName << endl << endl
             << "Valid ddt schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
index e40cece4d4dd87c2b063c043c55e0d2b7886e3bd..8d283b9fc8156b7867b09a5df5214570594a02dc 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
@@ -65,7 +65,7 @@ tmp<divScheme<Type> > divScheme<Type>::New
             schemeData
         )   << "Div scheme not specified" << endl << endl
             << "Valid div schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -82,7 +82,7 @@ tmp<divScheme<Type> > divScheme<Type>::New
             schemeData
         )   << "unknown div scheme " << schemeName << endl << endl
             << "Valid div schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
index ae5c3afce18e94fb92920fac7ea343daf47a2267..6d7cc56560f86fe08bc0c1297f03f0d8343a0212 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
@@ -64,7 +64,7 @@ tmp<gradScheme<Type> > gradScheme<Type>::New
             schemeData
         )   << "Grad scheme not specified" << endl << endl
             << "Valid grad schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -81,7 +81,7 @@ tmp<gradScheme<Type> > gradScheme<Type>::New
             schemeData
         )   << "unknown grad scheme " << schemeName << endl << endl
             << "Valid grad schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
index a0b04008e2721b556eece675b135040f397d35fa..eb14f253ad8eeeb07b7d8c09be500434c1ccb4e0 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
@@ -63,7 +63,7 @@ tmp<laplacianScheme<Type, GType> > laplacianScheme<Type, GType>::New
             schemeData
         )   << "Laplacian scheme not specified" << endl << endl
             << "Valid laplacian schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -80,7 +80,7 @@ tmp<laplacianScheme<Type, GType> > laplacianScheme<Type, GType>::New
             schemeData
         )   << "unknown laplacian scheme " << schemeName << endl << endl
             << "Valid laplacian schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
index 54f5ff546043ede3c74d070ba0403cbae1a2afc6..5fee3519870faf5de08846a05dbd32d69b10138e 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
@@ -65,7 +65,7 @@ tmp<snGradScheme<Type> > snGradScheme<Type>::New
         )   << "Discretisation scheme not specified"
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshConstructorTablePtr_->toc()
+            << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -83,7 +83,7 @@ tmp<snGradScheme<Type> > snGradScheme<Type>::New
         )   << "Unknown discretisation scheme " << schemeName
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshConstructorTablePtr_->toc()
+            << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/newFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/newFvPatch.C
index 8ae0c3b0d933024edee7d0cebd2b9ad16d86a3e2..62c55633de2840548b7035697ed9b73a26d9ede8 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/newFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/newFvPatch.C
@@ -50,7 +50,7 @@ Foam::autoPtr<Foam::fvPatch> Foam::fvPatch::New
         FatalErrorIn("fvPatch::New(const polyPatch&, const fvBoundaryMesh&)")
             << "Unknown fvPatch type " << patch.type() << ".\n"
             << "Valid fvPatch types are :"
-            << polyPatchConstructorTablePtr_->toc()
+            << polyPatchConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/newInterpolation.C b/src/finiteVolume/interpolation/interpolation/interpolation/newInterpolation.C
index 377815ea9a0b44d14627f98f358ac34e668bd034..cf6827a10f4982fadb8ea1b39ecebf7ed3a0f71a 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolation/newInterpolation.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolation/newInterpolation.C
@@ -50,7 +50,7 @@ Foam::interpolation<Type>::New
         )   << "Unknown interpolation type " << interpolationType
             << " for field " << psi.name() << nl << nl
             << "Valid interpolation types : " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
index 77b18ab8066be7911b90404d7b21a70a9ec825f1..2d5b9dfcb9912e8388bbefa5101f4643b203b3de 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
@@ -62,7 +62,7 @@ limitedSurfaceInterpolationScheme<Type>::New
         )   << "Discretisation scheme not specified"
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshConstructorTablePtr_->toc()
+            << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -81,7 +81,7 @@ limitedSurfaceInterpolationScheme<Type>::New
         )   << "Unknown discretisation scheme " << schemeName
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshConstructorTablePtr_->toc()
+            << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -117,7 +117,7 @@ limitedSurfaceInterpolationScheme<Type>::New
         )   << "Discretisation scheme not specified"
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshConstructorTablePtr_->toc()
+            << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -136,7 +136,7 @@ limitedSurfaceInterpolationScheme<Type>::New
         )   << "Unknown discretisation scheme " << schemeName
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshFluxConstructorTablePtr_->toc()
+            << MeshFluxConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
index 5efc36af2f71efd2a7fcc4fe2bfe74fd6e66effa..a920dcb204326a89c4810d4f282473fd8476ba29 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
@@ -92,7 +92,7 @@ multivariateSurfaceInterpolationScheme<Type>::New
             schemeData
         )   << "unknown discretisation scheme " << schemeName << endl << endl
             << "Valid schemes are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index 4702ccb5aa7ed7f23c9f0366b658b8269bd6a066..9c43eeb48d1d878c77132990be542c1cdd4fb285 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -56,7 +56,7 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
         )   << "Discretisation scheme not specified"
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshConstructorTablePtr_->toc()
+            << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -83,7 +83,7 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
         )   << "Unknown discretisation scheme " << schemeName
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshConstructorTablePtr_->toc()
+            << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -110,7 +110,7 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
         )   << "Discretisation scheme not specified"
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshConstructorTablePtr_->toc()
+            << MeshConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -138,7 +138,7 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
         )   << "Unknown discretisation scheme " << schemeName
             << endl << endl
             << "Valid schemes are :" << endl
-            << MeshFluxConstructorTablePtr_->toc()
+            << MeshFluxConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C
index b794db4a4395c0bac94b932bb971918deda4b5f7..50936f456a903eb935cf8ec23f0cedc185fe496f 100644
--- a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C
@@ -68,7 +68,7 @@ Foam::autoPtr<Foam::motionDiffusivity> Foam::motionDiffusivity::New
         )   << "Unknown diffusion type " << diffTypeName
             << endl << endl
             << "Valid diffusion types are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C b/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C
index 511679af378ff8068ee71858476f627aecbdeb74..8607b8eab11716371eb7e32fd564358b4ca02a4d 100644
--- a/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C
+++ b/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C
@@ -74,7 +74,7 @@ Foam::autoPtr<Foam::injectorType> Foam::injectorType::New
             << injectorTypeName
             << ", constructor not in hash table" << endl << endl
             << "    Valid injector types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<injectorType>(cstrIter()(t, dict));
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/newAtomizationModel.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/newAtomizationModel.C
index 7a5cfdffe1feaaa2c3c04d95a97cd80f4af3715d..8d2d8ca99f0c9af99dac2a03506b022671311b62 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/newAtomizationModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/newAtomizationModel.C
@@ -61,7 +61,7 @@ autoPtr<atomizationModel> atomizationModel::New
             << atomizationModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid atomizationModel types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<atomizationModel>(cstrIter()(dict, sm));
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/newBreakupModel.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/newBreakupModel.C
index 69f3c5fcf494332c4a63cf104db53b29cf1fa79f..d0889443eb48df400bdc4a2e810c89cccad36403 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/newBreakupModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/newBreakupModel.C
@@ -62,7 +62,7 @@ autoPtr<breakupModel> breakupModel::New
             << breakupModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid breakupModel types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<breakupModel>(cstrIter()(dict, sm));
diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/newCollisionModel.C b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/newCollisionModel.C
index 8f60f6dc4d4296133fa49e6a1d0431b0a07b189b..942ebafe8d9a387eed6040a84afdb86fdbef050b 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/newCollisionModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/newCollisionModel.C
@@ -67,7 +67,7 @@ autoPtr<collisionModel> collisionModel::New
             << ", constructor not in hash table" << endl << endl
             << "    Valid collisionModel types are :"
             << endl;
-        Info<< dictionaryConstructorTablePtr_->toc()
+        Info<< dictionaryConstructorTablePtr_->sortedToc()
             << abort(FatalError);
     }
 
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/newDispersionModel.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/newDispersionModel.C
index cf03049155fb10b8dd9264ea6cb574fe12371e05..50d6cbce8ae66cfda226d6e552a84889fe43f41d 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/newDispersionModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/newDispersionModel.C
@@ -62,7 +62,7 @@ autoPtr<dispersionModel> dispersionModel::New
             << dispersionModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid dispersionModel types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<dispersionModel>(cstrIter()(dict, sm));
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/newDragModel.C b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/newDragModel.C
index 7424851d62373428628a85b5e8a1080400b46b5e..6fed754f9541b9256c78d628aff5fd1ba858a0fa 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/newDragModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/newDragModel.C
@@ -60,7 +60,7 @@ autoPtr<dragModel> dragModel::New
             << dragModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid dragModel types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<dragModel>(cstrIter()(dict));
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C
index ff94baf8309679b36dd91540062dd3fd134f1835..2d400a09d4fa3fe51a89a22a03e2bad98ef24fca 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C
@@ -62,7 +62,7 @@ autoPtr<evaporationModel> evaporationModel::New
             << evaporationModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid evaporationModel types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<evaporationModel>(cstrIter()(dict));
diff --git a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/newHeatTransferModel.C b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/newHeatTransferModel.C
index 4be6465c6dd203ef9a0a72c278a51599bb0ffc43..308fbfa697f4290d18e1db7c29f3626e5ef7fde1 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/newHeatTransferModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/newHeatTransferModel.C
@@ -60,7 +60,7 @@ autoPtr<heatTransferModel> heatTransferModel::New
             << heatTransferModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid heatTransferModel types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<heatTransferModel>(cstrIter()(dict));
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/newInjectorModel.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/newInjectorModel.C
index 59940886c700f7df7836cbab507ee449eec90a0e..41758a82597ce5fb22bbb1db428d3f9328b824f3 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/newInjectorModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/newInjectorModel.C
@@ -61,7 +61,7 @@ autoPtr<injectorModel> injectorModel::New
             << injectorModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid injectorModel types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<injectorModel>(cstrIter()(dict, sm));
diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/newWallModel.C b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/newWallModel.C
index c4648bc90a32f1a291eae963017e06a4d5cfda34..3274533b1d7d9253b345120eaa2481067cc95a2e 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/newWallModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/newWallModel.C
@@ -61,7 +61,7 @@ autoPtr<wallModel> wallModel::New
             << wallModelType
             << ", constructor not in hash table" << endl << endl
             << "    Valid wallModel types are :" << endl;
-        Info<< dictionaryConstructorTablePtr_->toc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return autoPtr<wallModel>(cstrIter()(dict, U, sm));
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C
index 12c74f6697e7044396331aec3a95bc9326594ee4..e122b66eaacc6ceb0be48b0624fe29868f72d225 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C
@@ -56,7 +56,7 @@ Foam::BinaryCollisionModel<CloudType>::New
             << BinaryCollisionModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid BinaryCollisionModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<BinaryCollisionModel<CloudType> >
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/NewInflowBoundaryModel.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/NewInflowBoundaryModel.C
index bc1005bdaf58e60923fdfdf7a95f9a79c895b279..b94f08898b17efd4a21366cda8af2c82dc6f79cd 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/NewInflowBoundaryModel.C
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/NewInflowBoundaryModel.C
@@ -53,7 +53,7 @@ Foam::InflowBoundaryModel<CloudType>::New
             << InflowBoundaryModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid InflowBoundaryModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<InflowBoundaryModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C
index 97197cd669ec6316ab43c8f1b10d927a68cd0025..63208124274e47aa23859dcab2d8fa818ff44474 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C
@@ -55,7 +55,7 @@ Foam::WallInteractionModel<CloudType>::New
             << WallInteractionModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid WallInteractionModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<WallInteractionModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/newIntegrationScheme.C b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/newIntegrationScheme.C
index db73158615bde22cbf8ddad94b556fca223a282a..83cbd33d8ac6d7a6fe0e2df17902e343a731e43d 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/newIntegrationScheme.C
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/newIntegrationScheme.C
@@ -55,7 +55,7 @@ Foam::IntegrationScheme<Type>::New
         )   << "Unknown IntegrationScheme type "
             << IntegrationSchemeTypeName << nl << nl
             << "Valid IntegrationScheme types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << nl
+            << dictionaryConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C
index 3bed47c540e80671de9a0062f47fae0438ea362e..f55fcb1190ac1129b2c28cff31e4da453a5b69dc 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C
@@ -48,7 +48,7 @@ Foam::autoPtr<Foam::DataEntry<Type> > Foam::DataEntry<Type>::New
             << "Unknown DataEntry type " << DataEntryType << " for DataEntry "
             << entryName << ". Constructor not in hash table" << nl << nl
             << "    Valid DataEntry types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << nl
+            << dictionaryConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
index 09717b8e86401a504900962c0863d57d82521d8b..35c748949be8be87a480d12a7e73c196e3cd3297 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
@@ -58,7 +58,7 @@ Foam::DispersionModel<CloudType>::New
             << DispersionModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid DispersionModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<DispersionModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C
index 6e1e80d3cda7a76abc961b277ca09e87f3d09664..2202079b8c95bb354dea25e2be9926bd1713cda0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C
@@ -55,7 +55,7 @@ Foam::autoPtr<Foam::DragModel<CloudType> > Foam::DragModel<CloudType>::New
             << DragModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid DragModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C
index c0926272c622c105007d025ecb4e025c8f906c39..3f6464ac0f55b26e600ed6929a617a3c14d40be5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C
@@ -56,7 +56,7 @@ Foam::InjectionModel<CloudType>::New
             << InjectionModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid InjectionModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<InjectionModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C
index 83740bb684d1e0dea8fdf4a8acc637fc5854170a..20887aa230fc12b4eab7ddbba820047969e522d9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C
@@ -57,7 +57,7 @@ Foam::PatchInteractionModel<CloudType>::New
             << PatchInteractionModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid PatchInteractionModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<PatchInteractionModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C
index 29c096b67769cefbb1626097d6f6c16b38f6ff22..563ceebec242ba7428e1eae77d2b0105c0338f42 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C
@@ -56,7 +56,7 @@ Foam::PostProcessingModel<CloudType>::New
             << PostProcessingModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid PostProcessingModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<PostProcessingModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
index 81d338176c1566f32a42aa47b41d78a4ea4b317c..1c9b9a11db18cd588a052ef3f79f2f5d17e64c60 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
@@ -56,7 +56,7 @@ Foam::CompositionModel<CloudType>::New
             << CompositionModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid CompositionModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << nl
+            << dictionaryConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
index 3b317c5b056a101e87da0e7c8ed22f8e6fe5261f..264b4b1226428f9c9a3311fd7a5734b0b23d4ef0 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
@@ -56,7 +56,7 @@ Foam::PhaseChangeModel<CloudType>::New
             << PhaseChangeModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid PhaseChangeModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<PhaseChangeModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
index cac0375b2816f94748edd2a0f12944a38483a51e..471fee8aabc8ed21896ae477dd36f83f3fae9952 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
@@ -57,7 +57,7 @@ Foam::DevolatilisationModel<CloudType>::New
             << DevolatilisationModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid DevolatilisationModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<DevolatilisationModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C
index 348bfa8a8c7dac79636131ac7489b0b27baefd27..807891d08ef8c19cc87d036e72ef9a6e88093859 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C
@@ -57,7 +57,7 @@ Foam::SurfaceReactionModel<CloudType>::New
             << SurfaceReactionModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid SurfaceReactionModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<SurfaceReactionModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C
index d5d4748c4db4727e12eb5164a8bd2285c124599c..235c9ae18c2920b078c149bbf8fbf6150f238d0b 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C
@@ -56,7 +56,7 @@ Foam::HeatTransferModel<CloudType>::New
             << HeatTransferModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid HeatTransferModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<HeatTransferModel<CloudType> >(cstrIter()(dict, owner));
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/newEnergyScalingFunction.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/newEnergyScalingFunction.C
index ccbdb8c92e7d2fa386df5ca3578e46f8c9b0d6b6..a7cb8455db4874756a6c28fda9f6da8491e6c937 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/newEnergyScalingFunction.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/newEnergyScalingFunction.C
@@ -60,7 +60,7 @@ autoPtr<energyScalingFunction> energyScalingFunction::New
         )   << "Unknown energyScalingFunction type "
             << energyScalingFunctionTypeName << nl << nl
             << "Valid  energyScalingFunctions are: " << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/newPairPotential.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/newPairPotential.C
index 2986a0e5394f73a6e2a6f63996668057536bb215..6123079583c4c4d0145b5ecae4b9340a1bfd22aa 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/newPairPotential.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/newPairPotential.C
@@ -56,7 +56,7 @@ autoPtr<pairPotential> pairPotential::New
         )   << "Unknown pairPotential type "
             << pairPotentialTypeName << nl << nl
             << "Valid  pairPotentials are: " << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/newTetherPotential.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/newTetherPotential.C
index 85c8a703596579aca1b3af84b2dcb84a24ef0773..a5b3ad6092ef64aa179bf39f2eed80daa7d9ad22 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/newTetherPotential.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/newTetherPotential.C
@@ -60,7 +60,7 @@ autoPtr<tetherPotential> tetherPotential::New
         )   << "Unknown tetherPotential type "
             << tetherPotentialTypeName << nl << nl
             << "Valid  tetherPotentials are: " << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C
index f3c95afc910c1bc73415cd483e6147c18ce40b1a..c0138e86e8d253b45660af2c2b0b0f264c1ded38 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.C
@@ -163,7 +163,7 @@ Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
         )   << "Unknown coordinateRotation type " << rotType << nl << nl
             << "Valid coordinateRotation types are :" <<  nl
             << "[default: axes " << typeName_() << "]"
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/meshTools/coordinateSystems/coordinateSystemNew.C b/src/meshTools/coordinateSystems/coordinateSystemNew.C
index 9a6ec2a0b4cec370ff2af0790867b54891d59d90..0c0752ededc995d311d08a137d6e08d2f3eae3fc 100644
--- a/src/meshTools/coordinateSystems/coordinateSystemNew.C
+++ b/src/meshTools/coordinateSystems/coordinateSystemNew.C
@@ -66,7 +66,7 @@ Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
         )   << "Unknown coordinateSystem type " << coordType << nl << nl
             << "Valid coordinateSystem types are :" << nl
             << "[default: " << typeName_() << "]"
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -102,7 +102,7 @@ Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
             "constructing coordinateSystem"
         )   << "Unknown coordinateSystem type " << coordType << nl << nl
             << "Valid coordinateSystem types are :" << nl
-            << origRotationConstructorTablePtr_->toc()
+            << origRotationConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/meshTools/searchableSurface/searchableSurface.C b/src/meshTools/searchableSurface/searchableSurface.C
index 5ec2338844693bf99314dab1267202918dfadaf9..ad687a11340c292da05d566cda05c3e3e46c393b 100644
--- a/src/meshTools/searchableSurface/searchableSurface.C
+++ b/src/meshTools/searchableSurface/searchableSurface.C
@@ -57,7 +57,7 @@ autoPtr<searchableSurface> searchableSurface::New
         )   << "Unknown searchableSurface type " << searchableSurfaceType
             << endl << endl
             << "Valid searchableSurface types : " << endl
-            << dictConstructorTablePtr_->toc()
+            << dictConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.C b/src/meshTools/sets/topoSetSource/topoSetSource.C
index 199c47203e97a89eec024d330cad4a3c01a792a1..63aff6fc8334c931d06722bd1bef1e629d3e9c31 100644
--- a/src/meshTools/sets/topoSetSource/topoSetSource.C
+++ b/src/meshTools/sets/topoSetSource/topoSetSource.C
@@ -60,7 +60,7 @@ autoPtr<topoSetSource> topoSetSource::New
         )   << "Unknown topoSetSource type " << topoSetSourceType
             << endl << endl
             << "Valid topoSetSource types : " << endl
-            << wordConstructorTablePtr_->toc()
+            << wordConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
@@ -89,7 +89,7 @@ autoPtr<topoSetSource> topoSetSource::New
         )   << "Unknown topoSetSource type " << topoSetSourceType
             << endl << endl
             << "Valid topoSetSource types : " << endl
-            << istreamConstructorTablePtr_->toc()
+            << istreamConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C
index 152193313ec3e5315bf897744643f9e67ac7792a..32f8d1ff989c6981b216fa5e83bb6fe23f269661 100644
--- a/src/meshTools/sets/topoSets/topoSet.C
+++ b/src/meshTools/sets/topoSets/topoSet.C
@@ -64,7 +64,7 @@ autoPtr<topoSet> topoSet::New
         )   << "Unknown set type " << setType
             << endl << endl
             << "Valid set types : " << endl
-            << wordConstructorTablePtr_->toc()
+            << wordConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
@@ -95,7 +95,7 @@ autoPtr<topoSet> topoSet::New
         )   << "Unknown set type " << setType
             << endl << endl
             << "Valid set types : " << endl
-            << sizeConstructorTablePtr_->toc()
+            << sizeConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/postProcessing/foamCalcFunctions/calcType/newCalcType.C b/src/postProcessing/foamCalcFunctions/calcType/newCalcType.C
index 0c58abc5b042a3227b0abbad1eaed98c5eb87010..d5d8e4de1002e677c3f3f58cd11097c10b2d3ae6 100644
--- a/src/postProcessing/foamCalcFunctions/calcType/newCalcType.C
+++ b/src/postProcessing/foamCalcFunctions/calcType/newCalcType.C
@@ -44,7 +44,7 @@ Foam::autoPtr<Foam::calcType> Foam::calcType::New
             << "    unknown calcType type " << calcTypeName
             << ", constructor not in hash table" << nl << nl
             << "    Valid calcType selections are: " << nl
-            << dictionaryConstructorTablePtr_->toc() << nl
+            << dictionaryConstructorTablePtr_->sortedToc() << nl
             << abort(FatalError);
     }
 
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.C b/src/sampling/sampledSet/sampledSet/sampledSet.C
index 7b6f08206f21cb4fbccd64b204bdee66c52691bc..8b1dbaa33519992f9b5954b29bb7f2761decc6b8 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.C
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.C
@@ -430,7 +430,7 @@ Foam::autoPtr<Foam::sampledSet> Foam::sampledSet::New
         )   << "Unknown sample type " << sampleType
             << endl << endl
             << "Valid sample types : " << endl
-            << wordConstructorTablePtr_->toc()
+            << wordConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/sampling/sampledSet/writers/writer.C b/src/sampling/sampledSet/writers/writer.C
index 3a116b564e04bba5905acb44fe563e45a65bb609..b16966d3a1b1f23381f6f7eacef1389f69db0bc2 100644
--- a/src/sampling/sampledSet/writers/writer.C
+++ b/src/sampling/sampledSet/writers/writer.C
@@ -49,7 +49,7 @@ Foam::autoPtr<Foam::writer<Type> > Foam::writer<Type>::New
         )   << "Unknown write type " << writeType
             << endl << endl
             << "Valid write types : " << endl
-            << wordConstructorTablePtr_->toc()
+            << wordConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
index 5cbe630486d1c91f828fbd1583df80b9f5d15741..4f372a49b5f9e8b970374847e52138d01475f8cd 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C
@@ -141,7 +141,7 @@ Foam::sampledSurface::New
         )   << "Unknown sample type " << sampleType
             << endl << endl
             << "Valid sample types : " << endl
-            << wordConstructorTablePtr_->toc()
+            << wordConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.C b/src/sampling/sampledSurface/writers/surfaceWriter.C
index 99e19b96ddd4210183e095209b366bd7925a15da..a78ecbd21f53c72c7bdf82c81ba5b2fb0a637fb6 100644
--- a/src/sampling/sampledSurface/writers/surfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/surfaceWriter.C
@@ -77,7 +77,7 @@ Foam::surfaceWriter<Type>::New(const word& writeType)
                 "surfaceWriter::New(const word&)"
             )   << "Unknown write type \"" << writeType << "\"\n\n"
                 << "Valid write types : "
-                << wordConstructorTablePtr_->toc() << nl
+                << wordConstructorTablePtr_->sortedToc() << nl
                 << "Valid proxy types : "
                 << MeshedSurfaceProxy<face>::writeTypes() << endl
                 << exit(FatalError);
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C
index 3ebc3c6532b94d185c03b30c70c03e31f70dc356..77f6592775ad06bc4e3ee08ec7154d374da7e698 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/newBarotropicCompressibilityModel.C
@@ -55,7 +55,7 @@ Foam::barotropicCompressibilityModel::New
         )   << "Unknown barotropicCompressibilityModel type "
             << bcModelTypeName << endl << endl
             << "Valid  barotropicCompressibilityModels are : " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/newBasicPsiThermo.C b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/newBasicPsiThermo.C
index 3f9c43a0f9ee4f1edb837fa43becbea43f9e194c..038ac2e84385768f767606dfe802921c9f8cad58 100644
--- a/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/newBasicPsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/newBasicPsiThermo.C
@@ -64,7 +64,7 @@ Foam::autoPtr<Foam::basicPsiThermo> Foam::basicPsiThermo::New
         FatalErrorIn("basicPsiThermo::New(const fvMesh&)")
             << "Unknown basicPsiThermo type " << thermoTypeName << nl << nl
             << "Valid basicPsiThermo types are:" << nl
-            << fvMeshConstructorTablePtr_->toc() << nl
+            << fvMeshConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C
index 9a7ec5ac86f19c77078dc9a2ce899baa732d2bda..46eeed365ccbaff0e6a1182b93d2d2e7aa5b0014 100644
--- a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C
+++ b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C
@@ -67,7 +67,7 @@ Foam::autoPtr<Foam::basicRhoThermo> Foam::basicRhoThermo::New
         FatalErrorIn("basicRhoThermo::New(const fvMesh&)")
             << "Unknown basicRhoThermo type " << thermoTypeName << nl << nl
             << "Valid basicRhoThermo types are:" << nl
-            << fvMeshConstructorTablePtr_->toc() << nl
+            << fvMeshConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/newPsiChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/newPsiChemistryModel.C
index 6a5606d0e73f13bdc636512e8e5217d95a5f5f8e..a7f6ed9a50b79fd877f2b7f985c0e33cf7b3de8d 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/newPsiChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/psiChemistryModel/newPsiChemistryModel.C
@@ -86,11 +86,11 @@ Foam::autoPtr<Foam::psiChemistryModel> Foam::psiChemistryModel::New
             FatalErrorIn("psiChemistryModelBase::New(const mesh&)")
                 << "Unknown psiChemistryModel type " << psiChemistryModelType
                 << nl << nl << "Valid psiChemistryModel types are:" << nl
-                << fvMeshConstructorTablePtr_->toc() << nl << exit(FatalError);
+                << fvMeshConstructorTablePtr_->sortedToc() << nl << exit(FatalError);
         }
         else
         {
-            wordList models = fvMeshConstructorTablePtr_->toc();
+            wordList models = fvMeshConstructorTablePtr_->sortedToc();
             forAll(models, i)
             {
                 models[i] = models[i].replace(typeName + ',', "");
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/newRhoChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/newRhoChemistryModel.C
index c59a607f872dd92a5f569b245b95e22cfd34a2cb..0fdad4e0a0122e6e3ac234f572c204ce5bd5762d 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/newRhoChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/newRhoChemistryModel.C
@@ -86,11 +86,11 @@ Foam::autoPtr<Foam::rhoChemistryModel> Foam::rhoChemistryModel::New
             FatalErrorIn("rhoChemistryModelBase::New(const mesh&)")
                 << "Unknown rhoChemistryModel type " << rhoChemistryModelType
                 << nl << nl << "Valid rhoChemistryModel types are:" << nl
-                << fvMeshConstructorTablePtr_->toc() << nl << exit(FatalError);
+                << fvMeshConstructorTablePtr_->sortedToc() << nl << exit(FatalError);
         }
         else
         {
-            wordList models = fvMeshConstructorTablePtr_->toc();
+            wordList models = fvMeshConstructorTablePtr_->sortedToc();
             forAll(models, i)
             {
                 models[i] = models[i].replace(typeName + ',', "");
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C
index b0baa00fbe9068c1c61e487296a66fe88871c45c..e8f4b74495096f3b26713932e7d11a3d3ece2674 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C
@@ -49,7 +49,7 @@ Foam::chemistrySolver<CompType, ThermoType>::New
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        wordList models = dictionaryConstructorTablePtr_->toc();
+        wordList models = dictionaryConstructorTablePtr_->sortedToc();
         forAll(models, i)
         {
             models[i] = models[i].replace
diff --git a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/newLaminarFlameSpeed.C b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/newLaminarFlameSpeed.C
index 685f1d7e4fd004cd306e276c10fdc4b079bb2590..e44f40c4c9b20092f00d1a70ffffa45fbb76bfd6 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/newLaminarFlameSpeed.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/laminarFlameSpeed/newLaminarFlameSpeed.C
@@ -66,7 +66,7 @@ Foam::autoPtr<Foam::laminarFlameSpeed> Foam::laminarFlameSpeed::New
         )   << "Unknown laminarFlameSpeed type "
             << laminarFlameSpeedType << endl << endl
             << "Valid laminarFlameSpeed types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/thermophysicalModels/liquids/liquid/liquid.C b/src/thermophysicalModels/liquids/liquid/liquid.C
index c2b5f8b3fad858d6e93fb1f06aad83b680dd23ba..542a215ff0c8b26bae0e0728cda8725f63c5f747 100644
--- a/src/thermophysicalModels/liquids/liquid/liquid.C
+++ b/src/thermophysicalModels/liquids/liquid/liquid.C
@@ -64,7 +64,7 @@ Foam::autoPtr<Foam::liquid> Foam::liquid::New(Istream& is)
                 << "Unknown liquid type " << liquidType
                 << nl << nl
                 << "Valid liquid types are:" << nl
-                << ConstructorTablePtr_->toc()
+                << ConstructorTablePtr_->sortedToc()
                 << abort(FatalError);
         }
 
@@ -81,7 +81,7 @@ Foam::autoPtr<Foam::liquid> Foam::liquid::New(Istream& is)
                 << "Unknown liquid type " << liquidType
                 << endl << endl
                 << "Valid liquid types are:" << nl
-                << IstreamConstructorTablePtr_->toc()
+                << IstreamConstructorTablePtr_->sortedToc()
                 << abort(FatalError);
         }
 
diff --git a/src/thermophysicalModels/pdfs/pdf/newPdf.C b/src/thermophysicalModels/pdfs/pdf/newPdf.C
index ce13e261fbab27477b33476d46eecd8d8a2869c4..5a3b077d2190e68ad8539672850b624fc4e3d28d 100644
--- a/src/thermophysicalModels/pdfs/pdf/newPdf.C
+++ b/src/thermophysicalModels/pdfs/pdf/newPdf.C
@@ -46,7 +46,7 @@ Foam::autoPtr<Foam::pdf> Foam::pdf::New
         FatalErrorIn("pdf::New(const dictionary&, Random&)")
             << "unknown pdf type " << pdfType << nl << nl
             << "Valid pdf types are:" << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C b/src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C
index c7840d9433599e97c0435390dc694b1fb134676f..a5c27adac8a13d54dff0f8908ebdb8d8c850cff4 100644
--- a/src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C
+++ b/src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C
@@ -76,7 +76,7 @@ autoPtr<radiationModel> radiationModel::New
         )   << "Unknown radiationModel type " << radiationModelTypeName
             << nl << nl
             << "Valid radiationModel types are:" << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/newAbsorptionEmissionModel.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/newAbsorptionEmissionModel.C
index d1628fd8d4a2dc321d02e29848a49a18326c9099..3ce41d3750164a0018d1739073d73166243a5711 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/newAbsorptionEmissionModel.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/newAbsorptionEmissionModel.C
@@ -53,7 +53,7 @@ Foam::radiation::absorptionEmissionModel::New
             << absorptionEmissionModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid absorptionEmissionModel types are :" << nl
-            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
     }
 
     return autoPtr<absorptionEmissionModel>(cstrIter()(dict, mesh));
diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/newScatterModel.C b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/newScatterModel.C
index e1f545758a165337634398b86de4697b29d92850..82b451ae208dbdd7a5c76573ee12769969d69a79 100644
--- a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/newScatterModel.C
+++ b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/newScatterModel.C
@@ -51,7 +51,7 @@ Foam::autoPtr<Foam::radiation::scatterModel> Foam::radiation::scatterModel::New
             << scatterModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid scatterModel types are :" << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
index e178bd0338f685001280eba5f0433b0e6572b84a..931706484b706b792e1a284a00076dde84bfc6f1 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
@@ -55,7 +55,7 @@ Foam::chemistryReader<ThermoType>::New
         )   << "Unknown chemistryReader type "
             << chemistryReaderTypeName << nl << nl
             << "Valid  chemistryReaders are: " << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C
index 788a298d0d841b2d09d258cb2c35a904dd254bd7..b36172963c7d8d5e652993e6831c4c6d4267129e 100644
--- a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C
@@ -67,7 +67,7 @@ Foam::autoPtr<Foam::hCombustionThermo> Foam::hCombustionThermo::New
             << "Unknown hCombustionThermo type "
             << hCombustionThermoTypeName << nl << nl
             << "Valid hCombustionThermo types are:" << nl
-            << fvMeshConstructorTablePtr_->toc() << nl
+            << fvMeshConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
@@ -103,7 +103,7 @@ Foam::autoPtr<Foam::hCombustionThermo> Foam::hCombustionThermo::NewType
 
         if (hCombustionThermoTypeName.find(thermoType) == string::npos)
         {
-            wordList allModels = fvMeshConstructorTablePtr_->toc();
+            wordList allModels = fvMeshConstructorTablePtr_->sortedToc();
             DynamicList<word> validModels;
             forAll(allModels, i)
             {
@@ -140,7 +140,7 @@ Foam::autoPtr<Foam::hCombustionThermo> Foam::hCombustionThermo::NewType
             << "Unknown hCombustionThermo type "
             << hCombustionThermoTypeName << nl << nl
             << "Valid hCombustionThermo types are:" << nl
-            << fvMeshConstructorTablePtr_->toc() << nl
+            << fvMeshConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/newhhuCombustionThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/newhhuCombustionThermo.C
index 2e21f2d9c579a9c79bbc794c5388d9d50b8af05d..4945cc8815a5970a9e0384c2cf61017a880f51b6 100644
--- a/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/newhhuCombustionThermo.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/newhhuCombustionThermo.C
@@ -69,7 +69,7 @@ autoPtr<hhuCombustionThermo> hhuCombustionThermo::New(const fvMesh& mesh)
             << "Unknown hhuCombustionThermo type "
             << hhuCombustionThermoTypeName << endl << endl
             << "Valid hhuCombustionThermo types are :" << endl
-            << fvMeshConstructorTablePtr_->toc()
+            << fvMeshConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C
index 688b37b6d2a726a82771119fd896c3649bcf59df..ad0c92f04ff8168f69b50581b8790420e3895f92 100644
--- a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C
@@ -67,7 +67,7 @@ Foam::autoPtr<Foam::hReactionThermo> Foam::hReactionThermo::New
             << "Unknown hReactionThermo type "
             << hReactionThermoTypeName << nl << nl
             << "Valid hReactionThermo types are:" << nl
-            << fvMeshConstructorTablePtr_->toc() << nl
+            << fvMeshConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
@@ -103,7 +103,7 @@ Foam::autoPtr<Foam::hReactionThermo> Foam::hReactionThermo::NewType
 
         if (hReactionThermoTypeName.find(thermoType) == string::npos)
         {
-            wordList allModels = fvMeshConstructorTablePtr_->toc();
+            wordList allModels = fvMeshConstructorTablePtr_->sortedToc();
             DynamicList<word> validModels;
             forAll(allModels, i)
             {
@@ -140,7 +140,7 @@ Foam::autoPtr<Foam::hReactionThermo> Foam::hReactionThermo::NewType
             << "Unknown hReactionThermo type "
             << hReactionThermoTypeName << nl << nl
             << "Valid hReactionThermo types are:" << nl
-            << fvMeshConstructorTablePtr_->toc() << nl
+            << fvMeshConstructorTablePtr_->sortedToc() << nl
             << exit(FatalError);
     }
 
diff --git a/src/thermophysicalModels/solids/solid/newSolid.C b/src/thermophysicalModels/solids/solid/newSolid.C
index 445a98a00d31e5df5b3620ed0521a2d394ebdd79..63cf5c22affa78577926b2dbf1c3cf2b6297eb30 100644
--- a/src/thermophysicalModels/solids/solid/newSolid.C
+++ b/src/thermophysicalModels/solids/solid/newSolid.C
@@ -51,7 +51,7 @@ Foam::autoPtr<Foam::solid> Foam::solid::New(Istream& is)
             FatalErrorIn("solid::New(Istream&)")
                 << "Unknown solid type " << solidType << nl << nl
                 << "Valid solid types are:" << endl
-                << ConstructorTablePtr_->toc()
+                << ConstructorTablePtr_->sortedToc()
                 << exit(FatalError);
         }
 
@@ -67,7 +67,7 @@ Foam::autoPtr<Foam::solid> Foam::solid::New(Istream& is)
             FatalErrorIn("solid::New(Istream&)")
                 << "Unknown solid type " << solidType << nl << nl
                 << "Valid solid types are:" << endl
-                << IstreamConstructorTablePtr_->toc()
+                << IstreamConstructorTablePtr_->sortedToc()
                 << exit(FatalError);
         }
 
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
index f0ebd1c61a9c88bc8fba22ab306e65edca744127..ad5c2e1185ae63f0ad65758cb8aed50f6211b728 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
@@ -228,7 +228,7 @@ autoPtr<Reaction<ReactionThermo> > Reaction<ReactionThermo>::New
             is
         )   << "Reaction type not specified" << endl << endl
             << "Valid Reaction types are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -246,7 +246,7 @@ autoPtr<Reaction<ReactionThermo> > Reaction<ReactionThermo>::New
             is
         )   << "Unknown reaction type " << reactionTypeName << endl << endl
             << "Valid reaction types are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
index 7eda81bb2bccfbc2f20f727782a8706c98a394c1..7cf74b659ee78fb1474e45598dd874e92779c9d0 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
@@ -62,7 +62,7 @@ autoPtr<thermophysicalFunction> thermophysicalFunction::New(Istream& is)
             << thermophysicalFunctionType
             << endl << endl
             << "Valid thermophysicalFunction types are :" << endl
-            << IstreamConstructorTablePtr_->toc()
+            << IstreamConstructorTablePtr_->sortedToc()
             << abort(FatalError);
     }
 
diff --git a/src/transportModels/incompressible/viscosityModels/viscosityModel/newViscosityModel.C b/src/transportModels/incompressible/viscosityModels/viscosityModel/newViscosityModel.C
index fd7aa5183d14f8e0ddb717714fb9901b0fdf5f58..aeba455a8dc32b222971fb161093063ee9612a89 100644
--- a/src/transportModels/incompressible/viscosityModels/viscosityModel/newViscosityModel.C
+++ b/src/transportModels/incompressible/viscosityModels/viscosityModel/newViscosityModel.C
@@ -60,7 +60,7 @@ autoPtr<viscosityModel> viscosityModel::New
         )   << "Unknown viscosityModel type "
             << viscosityModelTypeName << endl << endl
             << "Valid  viscosityModels are : " << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
index 5f4283859a66cb5ebd010a6e649a6cd042f47166..54a73b1243abfb33bc7c8069de3db4955be2fdc9 100644
--- a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
+++ b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
@@ -80,7 +80,7 @@ autoPtr<LESdelta> LESdelta::New
             "LESdelta::New(const fvMesh&, const dictionary&)"
         )   << "Unknown LESdelta type " << deltaType << endl << endl
             << "Valid LESdelta types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
index e77e00f189384baf3da46ec5c306987299dcbb0d..ba60f21e4ca4e10041a3da66632f1edbfeaf6019 100644
--- a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
+++ b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
@@ -59,7 +59,7 @@ autoPtr<LESfilter> LESfilter::New
             "LESfilter::New(const fvMesh&, const dictionary&)"
         )   << "Unknown LESfilter type " << filterType << endl << endl
             << "Valid LESfilter types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
index dd166f2693bc1ad14cd6f85d4fdcbb1277b416bf..c32cb077d8a82a5425ec70060bd6dfb371187e32 100644
--- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
+++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
@@ -136,7 +136,7 @@ autoPtr<LESModel> LESModel::New
         )   << "Unknown LESModel type " << modelName
             << endl << endl
             << "Valid LESModel types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
index b390bca5e5e3f69340f02aeabbd2434e076e3c43..1d4054fb04fc37f1cdd8c8bcc7aae8acd3512cf8 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
@@ -141,7 +141,7 @@ autoPtr<RASModel> RASModel::New
         )   << "Unknown RASModel type " << modelName
             << endl << endl
             << "Valid RASModel types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
index 15cce81cc148cbf2baa07613a4c8d7520e909309..8c544ddef9dea2ef70764767d6841d120852c30e 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
@@ -106,7 +106,7 @@ autoPtr<turbulenceModel> turbulenceModel::New
         )   << "Unknown turbulenceModel type " << modelName
             << endl << endl
             << "Valid turbulenceModel types are :" << endl
-            << turbulenceModelConstructorTablePtr_->toc()
+            << turbulenceModelConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
index 3458e03c6bb16032cfefb84c87bd2d15b34aceff..76c2ef0ba475c0ba25be0728c787087a2bff2db4 100644
--- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
+++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
@@ -133,7 +133,7 @@ autoPtr<LESModel> LESModel::New
         )   << "Unknown LESModel type " << modelName
             << endl << endl
             << "Valid LESModel types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
index d3366d8206d452af5425c17f261ef0dcec9ff212..c2546e659eba7a99df77c333eab929d5bae50096 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
@@ -138,7 +138,7 @@ autoPtr<RASModel> RASModel::New
         )   << "Unknown RASModel type " << modelName
             << endl << endl
             << "Valid RASModel types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
index cdbb61fa7062dff384144ae916df3aa804243e7f..2cc9c9462a3fdb2b09a598628b12d3abb63c7f0d 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
@@ -102,7 +102,7 @@ autoPtr<turbulenceModel> turbulenceModel::New
         )   << "Unknown turbulenceModel type " << modelName
             << endl << endl
             << "Valid turbulenceModel types are :" << endl
-            << turbulenceModelConstructorTablePtr_->toc()
+            << turbulenceModelConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }