diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
index 0e214011dee27ee9645a852eda71d2911911735e..96a8ea84213810748eaad1f490df26b9fa87a90a 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
@@ -45,8 +45,8 @@ dimensionedScalar rhoMax
     (
         "rhoMax",
         pimple.dict(),
-        GREAT,
-        dimDensity
+        dimDensity,
+        GREAT
     )
 );
 
@@ -56,8 +56,8 @@ dimensionedScalar rhoMin
     (
         "rhoMin",
         pimple.dict(),
-        0,
-        dimDensity
+        dimDensity,
+        0
     )
 );
 
diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
index 2d89e2b56675f0cbdc46190b145e0b4a06701a39..fdf8a2a769e20bfbe12939cf91cd0c16c1c64d52 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
@@ -52,8 +52,8 @@ dimensionedScalar rhoMax
     (
         "rhoMax",
         simple.dict(),
-        GREAT,
-        dimDensity
+        dimDensity,
+        GREAT
     )
 );
 
@@ -63,8 +63,8 @@ dimensionedScalar rhoMin
     (
         "rhoMin",
         simple.dict(),
-        0,
-        dimDensity
+        dimDensity,
+        0
     )
 );
 
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
index 3ce8270b5e027444a5fdea912cd0fa6535322cd8..149049e63ee4a727beb791fecc47f1bc7c5a9e60 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
@@ -51,8 +51,8 @@ dimensionedScalar rhoMax
     (
         "rhoMax",
         simple.dict(),
-        GREAT,
-        dimDensity
+        dimDensity,
+        GREAT
     )
 );
 
@@ -62,8 +62,8 @@ dimensionedScalar rhoMin
     (
         "rhoMin",
         simple.dict(),
-        0,
-        dimDensity
+        dimDensity,
+        0
     )
 );
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
index bd7452ae9e39ad73b7bdd45108ecbdbcdb6b2c9f..1811878bd738453bf1a8f4eebc23cc7396b8d39d 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
@@ -187,8 +187,8 @@ forAll(fluidRegions, i)
             (
                 "rhoMax",
                 simpleDict,
-                GREAT,
-                dimDensity
+                dimDensity,
+                GREAT
             )
         )
     );
@@ -202,8 +202,8 @@ forAll(fluidRegions, i)
             (
                 "rhoMin",
                 simpleDict,
-                0,
-                dimDensity
+                dimDensity,
+                0
             )
         )
     );
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
index 43c3d45e320490676f3f551974662d3b7011383b..9d05da04250c41c34fdb8e3d826aff657519c79b 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
@@ -64,8 +64,8 @@ dimensionedScalar rhoMax
     (
         "rhoMax",
         pimple.dict(),
-        GREAT,
-        dimDensity
+        dimDensity,
+        GREAT
     )
 );
 
@@ -75,8 +75,8 @@ dimensionedScalar rhoMin
     (
         "rhoMin",
         pimple.dict(),
-        0,
-        dimDensity
+        dimDensity,
+        0
     )
 );
 
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
index 7e79f9fb7db552b4e2dcb78150f250a003d7947e..cfabbfb5b05fa41b8717fec5162d29292c1ad5f5 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
@@ -64,8 +64,8 @@ dimensionedScalar rhoMax
     (
         "rhoMax",
         simple.dict(),
-        GREAT,
-        dimDensity
+        dimDensity,
+        GREAT
     )
 );
 
@@ -75,8 +75,8 @@ dimensionedScalar rhoMin
     (
         "rhoMin",
         simple.dict(),
-        0,
-        dimDensity
+        dimDensity,
+        0
     )
 );
 
diff --git a/applications/solvers/lagrangian/sprayFoam/createFields.H b/applications/solvers/lagrangian/sprayFoam/createFields.H
index 721c3f8319ecda938c20533daf8c301e945cf5c6..7cc45050ce4dbfe94fabfaf9fc163a0608967506 100644
--- a/applications/solvers/lagrangian/sprayFoam/createFields.H
+++ b/applications/solvers/lagrangian/sprayFoam/createFields.H
@@ -64,8 +64,8 @@ dimensionedScalar rhoMax
     (
         "rhoMax",
         pimple.dict(),
-        GREAT,
-        dimDensity
+        dimDensity,
+        GREAT
     )
 );
 
@@ -75,8 +75,8 @@ dimensionedScalar rhoMin
     (
         "rhoMin",
         pimple.dict(),
-        0,
-        dimDensity
+        dimDensity,
+        0
     )
 );
 
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index 6a0cbb7861aca0ad3d265145285935389ba49af7..fdb38737a5b41d49034de20240d912e18efdaf3b 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -198,18 +198,10 @@ Foam::dimensioned<Type> Foam::dimensioned<Type>::lookupOrDefault
 (
     const word& name,
     const dictionary& dict,
-    const Type& defaultValue,
-    const dimensionSet& dims
+    const Type& defaultValue
 )
 {
-    if (dict.found(name))
-    {
-        return dimensioned<Type>(name, dims, dict.lookup(name));
-    }
-    else
-    {
-        return dimensioned<Type>(name, dims, defaultValue);
-    }
+    return lookupOrDefault(name, dict, dimless, defaultValue);
 }
 
 
@@ -232,12 +224,10 @@ Foam::dimensioned<Type> Foam::dimensioned<Type>::lookupOrAddToDict
 (
     const word& name,
     dictionary& dict,
-    const Type& defaultValue,
-    const dimensionSet& dims
+    const Type& defaultValue
 )
 {
-    Type value = dict.lookupOrAddDefault<Type>(name, defaultValue);
-    return dimensioned<Type>(name, dims, value);
+    return lookupOrAddToDict(name, dict, dimless, defaultValue);
 }
 
 
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index 2fcf61c2dbbfe16b6dfbf731f59026e8167f921c..40baca77f6ae2efee6a2f5e604d0aa99c8f3c67b 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -132,14 +132,12 @@ public:
             const Type& defaultValue = pTraits<Type>::zero
         );
 
-        //- Construct from dictionary, with default value and dimensions.
-        //  Deprecated, use form with dimensions before value.
+        //- Construct from dictionary dimensionless with value.
         static dimensioned<Type> lookupOrDefault
         (
             const word&,
             const dictionary&,
-            const Type& defaultValue = pTraits<Type>::zero,
-            const dimensionSet& dims = dimless
+            const Type& defaultValue = pTraits<Type>::zero
         );
 
         //- Construct from dictionary, with default value.
@@ -152,15 +150,13 @@ public:
             const Type& defaultValue = pTraits<Type>::zero
         );
 
-        //- Construct from dictionary, with default value.
+        //- Construct from dictionary, dimensionless with default value.
         //  If the value is not found, it is added into the dictionary.
-        //  Deprecated, use form with dimensions before value.
         static dimensioned<Type> lookupOrAddToDict
         (
             const word&,
             dictionary&,
-            const Type& defaultValue = pTraits<Type>::zero,
-            const dimensionSet& dims = dimless
+            const Type& defaultValue = pTraits<Type>::zero
         );
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
index 48c4cc0bd97894cabd780e3b33cead75a43b26f7..9955478f419b2bbc6c11978a01e808eb4ebda1df 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
@@ -75,8 +75,8 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
         (
             "kMin",
             LESDict_,
-            SMALL,
-            sqr(dimVelocity)
+            sqr(dimVelocity),
+            SMALL
         )
     ),
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
index 3e53f4f4145969f23298712ae49778e3856277a0..240c0870df11d4ac5ced130c8541020dec83b038 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
@@ -75,8 +75,8 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
         (
             "kMin",
             RASDict_,
-            SMALL,
-            sqr(dimVelocity)
+            sqr(dimVelocity),
+            SMALL
         )
     ),
 
@@ -86,8 +86,8 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
         (
             "epsilonMin",
             RASDict_,
-            SMALL,
-            kMin_.dimensions()/dimTime
+            kMin_.dimensions()/dimTime,
+            SMALL
         )
     ),
 
@@ -97,8 +97,8 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
         (
             "omegaMin",
             RASDict_,
-            SMALL,
-            dimless/dimTime
+            dimless/dimTime,
+            SMALL
         )
     )
 {