diff --git a/src/quick3d/qquick3dsceneenvironment.cpp b/src/quick3d/qquick3dsceneenvironment.cpp
index 2e31f40b649817aee22941d0e5149eba1b42bedc..fb0e8e2809819af18add9c5c0d384c28cde46494 100644
--- a/src/quick3d/qquick3dsceneenvironment.cpp
+++ b/src/quick3d/qquick3dsceneenvironment.cpp
@@ -478,8 +478,8 @@ QQmlListProperty<QQuick3DEffect> QQuick3DSceneEnvironment::effects()
         in sRGB color space.
     \value SceneEnvironment.TonemapModeAces
         Academy Color Encoding System tonemapping is applied.
-    \value SceneEnvironment.TonemapModeHejlRichard
-        Hejl Richard tonemapping is applied.
+    \value SceneEnvironment.TonemapModeHejlDawson
+        Hejl-Dawson tonemapping is applied.
     \value SceneEnvironment.TonemapModeFilmic
         Filmic tonemapping is applied.
 
diff --git a/src/quick3d/qquick3dsceneenvironment_p.h b/src/quick3d/qquick3dsceneenvironment_p.h
index 01d2c0072e1cd0e41a516a396977c5a514d9cfe8..ccb04f03b24070c17baf00a5a381969551908d57 100644
--- a/src/quick3d/qquick3dsceneenvironment_p.h
+++ b/src/quick3d/qquick3dsceneenvironment_p.h
@@ -116,7 +116,7 @@ public:
         TonemapModeNone = 0,
         TonemapModeLinear,
         TonemapModeAces,
-        TonemapModeHejlRichard,
+        TonemapModeHejlDawson,
         TonemapModeFilmic
     };
     Q_ENUM(QQuick3DEnvironmentTonemapModes)
diff --git a/src/runtimerender/CMakeLists.txt b/src/runtimerender/CMakeLists.txt
index a408f028894806fb97efa05f579b01f6f4891ba7..8a4c9264bbad97ed67f67617962b84866c80f359 100644
--- a/src/runtimerender/CMakeLists.txt
+++ b/src/runtimerender/CMakeLists.txt
@@ -136,8 +136,8 @@ set(res_resource_files
     "res/rhishaders/skybox_hdr_aces.vert.qsb"
     "res/rhishaders/skybox_hdr_filmic.frag.qsb"
     "res/rhishaders/skybox_hdr_filmic.vert.qsb"
-    "res/rhishaders/skybox_hdr_hejlrichard.frag.qsb"
-    "res/rhishaders/skybox_hdr_hejlrichard.vert.qsb"
+    "res/rhishaders/skybox_hdr_hejldawson.frag.qsb"
+    "res/rhishaders/skybox_hdr_hejldawson.vert.qsb"
     "res/rhishaders/skybox_hdr_linear.frag.qsb"
     "res/rhishaders/skybox_hdr_linear.vert.qsb"
     "res/rhishaders/skybox_hdr_none.frag.qsb"
@@ -146,8 +146,8 @@ set(res_resource_files
     "res/rhishaders/skybox_rgbe_aces.vert.qsb"
     "res/rhishaders/skybox_rgbe_filmic.frag.qsb"
     "res/rhishaders/skybox_rgbe_filmic.vert.qsb"
-    "res/rhishaders/skybox_rgbe_hejlrichard.frag.qsb"
-    "res/rhishaders/skybox_rgbe_hejlrichard.vert.qsb"
+    "res/rhishaders/skybox_rgbe_hejldawson.frag.qsb"
+    "res/rhishaders/skybox_rgbe_hejldawson.vert.qsb"
     "res/rhishaders/skybox_rgbe_linear.frag.qsb"
     "res/rhishaders/skybox_rgbe_linear.vert.qsb"
     "res/rhishaders/skybox_rgbe_none.frag.qsb"
diff --git a/src/runtimerender/graphobjects/qssgrenderlayer_p.h b/src/runtimerender/graphobjects/qssgrenderlayer_p.h
index 139bdf9832b4b1ebd7033597e6a384af7d1a8bc8..2244c8b25a318f6a2a2f9d6fb1c5351929e0a26b 100644
--- a/src/runtimerender/graphobjects/qssgrenderlayer_p.h
+++ b/src/runtimerender/graphobjects/qssgrenderlayer_p.h
@@ -106,7 +106,7 @@ struct Q_QUICK3DRUNTIMERENDER_EXPORT QSSGRenderLayer : public QSSGRenderNode
         None = 0, // Bypass mode
         Linear,
         Aces,
-        HejlRichard,
+        HejlDawson,
         Filmic
     };
 
diff --git a/src/runtimerender/qssgrendershadercache.cpp b/src/runtimerender/qssgrendershadercache.cpp
index 112505aeddbfe36c531270d502daf19391e950f6..dedae7e678c498b845acd55c0c928f274e40483b 100644
--- a/src/runtimerender/qssgrendershadercache.cpp
+++ b/src/runtimerender/qssgrendershadercache.cpp
@@ -58,7 +58,7 @@ static const char *defineTable[QSSGShaderDefines::Count] {
     "QSSG_ENABLE_CUBE_SHADOW_PASS",
     "QSSG_ENABLE_LINEAR_TONEMAPPING",
     "QSSG_ENABLE_ACES_TONEMAPPING",
-    "QSSG_ENABLE_HEJLRICHARD_TONEMAPPING",
+    "QSSG_ENABLE_HEJLDAWSON_TONEMAPPING",
     "QSSG_ENABLE_FILMIC_TONEMAPPING",
     "QSSG_ENABLE_RGBE_LIGHT_PROBE"
 };
diff --git a/src/runtimerender/qssgrendershadercache_p.h b/src/runtimerender/qssgrendershadercache_p.h
index 1f7c3ba133cc0909bc173e0738b900bfa9c71ad2..57581c42e0a2d82941db4db779bd3c3529efb929 100644
--- a/src/runtimerender/qssgrendershadercache_p.h
+++ b/src/runtimerender/qssgrendershadercache_p.h
@@ -74,7 +74,7 @@ enum Define : quint8
     CubeShadowPass,
     LinearTonemapping,
     AcesTonemapping,
-    HejlRichardTonemapping,
+    HejlDawsonTonemapping,
     FilmicTonemapping,
     RGBELightProbe,
     Count /* New defines are added before this one! */
diff --git a/src/runtimerender/rendererimpl/qssgrendererimpllayerrenderpreparationdata.cpp b/src/runtimerender/rendererimpl/qssgrendererimpllayerrenderpreparationdata.cpp
index 1720c8165b91f03abf7ccfb18bb165128779c90d..8d827d71c120d56fc8789b258bd34a3a03318a90 100644
--- a/src/runtimerender/rendererimpl/qssgrendererimpllayerrenderpreparationdata.cpp
+++ b/src/runtimerender/rendererimpl/qssgrendererimpllayerrenderpreparationdata.cpp
@@ -1288,8 +1288,8 @@ void QSSGLayerRenderPreparationData::prepareForRender(const QSize &inViewportDim
                          layer.tonemapMode == QSSGRenderLayer::TonemapMode::Linear);
         setShaderFeature(QSSGShaderDefines::AcesTonemapping,
                          layer.tonemapMode == QSSGRenderLayer::TonemapMode::Aces);
-        setShaderFeature(QSSGShaderDefines::HejlRichardTonemapping,
-                         layer.tonemapMode == QSSGRenderLayer::TonemapMode::HejlRichard);
+        setShaderFeature(QSSGShaderDefines::HejlDawsonTonemapping,
+                         layer.tonemapMode == QSSGRenderLayer::TonemapMode::HejlDawson);
         setShaderFeature(QSSGShaderDefines::FilmicTonemapping,
                          layer.tonemapMode == QSSGRenderLayer::TonemapMode::Filmic);
     }
diff --git a/src/runtimerender/rendererimpl/qssgrendererimplshaders_rhi.cpp b/src/runtimerender/rendererimpl/qssgrendererimplshaders_rhi.cpp
index 6321ab8cdff7cbdcfc19304076c6a0d1515b94ad..cfef511992c68727f97cc934120c515d2e58ac2f 100644
--- a/src/runtimerender/rendererimpl/qssgrendererimplshaders_rhi.cpp
+++ b/src/runtimerender/rendererimpl/qssgrendererimplshaders_rhi.cpp
@@ -98,8 +98,8 @@ QSSGRef<QSSGRhiShaderPipeline> QSSGRenderer::getRhiSkyBoxShader(QSSGRenderLayer:
         case QSSGRenderLayer::TonemapMode::Aces:
             name.append(QByteArrayLiteral("_aces"));
             break;
-        case QSSGRenderLayer::TonemapMode::HejlRichard:
-            name.append(QByteArrayLiteral("_hejlrichard"));
+        case QSSGRenderLayer::TonemapMode::HejlDawson:
+            name.append(QByteArrayLiteral("_hejldawson"));
             break;
         case QSSGRenderLayer::TonemapMode::Filmic:
             name.append(QByteArrayLiteral("_filmic"));
diff --git a/src/runtimerender/res.qrc b/src/runtimerender/res.qrc
index 6e492d5e486b799a33fddc76eb6158af3aff2aa5..09ea936451a716a1f493b0d2d34f76a08b3e0c58 100644
--- a/src/runtimerender/res.qrc
+++ b/src/runtimerender/res.qrc
@@ -43,22 +43,22 @@
         <file>res/effectlib/tonemapping.glsllib</file>
         <file>res/rhishaders/skybox_hdr_aces.frag.qsb</file>
         <file>res/rhishaders/skybox_hdr_filmic.frag.qsb</file>
-        <file>res/rhishaders/skybox_hdr_hejlrichard.frag.qsb</file>
+        <file>res/rhishaders/skybox_hdr_hejldawson.frag.qsb</file>
         <file>res/rhishaders/skybox_hdr_linear.frag.qsb</file>
         <file>res/rhishaders/skybox_hdr_none.frag.qsb</file>
         <file>res/rhishaders/skybox_rgbe_aces.frag.qsb</file>
         <file>res/rhishaders/skybox_rgbe_filmic.frag.qsb</file>
-        <file>res/rhishaders/skybox_rgbe_hejlrichard.frag.qsb</file>
+        <file>res/rhishaders/skybox_rgbe_hejldawson.frag.qsb</file>
         <file>res/rhishaders/skybox_rgbe_linear.frag.qsb</file>
         <file>res/rhishaders/skybox_rgbe_none.frag.qsb</file>
         <file>res/rhishaders/skybox_hdr_aces.vert.qsb</file>
         <file>res/rhishaders/skybox_hdr_filmic.vert.qsb</file>
-        <file>res/rhishaders/skybox_hdr_hejlrichard.vert.qsb</file>
+        <file>res/rhishaders/skybox_hdr_hejldawson.vert.qsb</file>
         <file>res/rhishaders/skybox_hdr_linear.vert.qsb</file>
         <file>res/rhishaders/skybox_hdr_none.vert.qsb</file>
         <file>res/rhishaders/skybox_rgbe_aces.vert.qsb</file>
         <file>res/rhishaders/skybox_rgbe_filmic.vert.qsb</file>
-        <file>res/rhishaders/skybox_rgbe_hejlrichard.vert.qsb</file>
+        <file>res/rhishaders/skybox_rgbe_hejldawson.vert.qsb</file>
         <file>res/rhishaders/skybox_rgbe_linear.vert.qsb</file>
         <file>res/rhishaders/skybox_rgbe_none.vert.qsb</file>
         <file>res/effectlib/funcdiffuseBurleyBSDF.glsllib</file>
diff --git a/src/runtimerender/res/effectlib/tonemapping.glsllib b/src/runtimerender/res/effectlib/tonemapping.glsllib
index d892b8e0511539ae323ce14ff918617f3e7163c1..b21b140b86e9e2f470c414a5e10f0cbdda0a8f54 100644
--- a/src/runtimerender/res/effectlib/tonemapping.glsllib
+++ b/src/runtimerender/res/effectlib/tonemapping.glsllib
@@ -57,8 +57,8 @@ vec4 qt_sRGBToLinearFast(vec4 srgbIn)
 #ifndef QSSG_ENABLE_ACES_TONEMAPPING
 #define QSSG_ENABLE_ACES_TONEMAPPING 0
 #endif
-#ifndef QSSG_ENABLE_HEJLRICHARD_TONEMAPPING
-#define QSSG_ENABLE_HEJLRICHARD_TONEMAPPING 0
+#ifndef QSSG_ENABLE_HEJLDAWSON_TONEMAPPING
+#define QSSG_ENABLE_HEJLDAWSON_TONEMAPPING 0
 #endif
 #ifndef QSSG_ENABLE_FILMIC_TONEMAPPING
 #define QSSG_ENABLE_FILMIC_TONEMAPPING 0
@@ -76,8 +76,8 @@ vec3 qt_toneMapACES(vec3 color)
 }
 #endif
 
-#if QSSG_ENABLE_HEJLRICHARD_TONEMAPPING
-vec3 qt_tonemapHejlRichard(vec3 color)
+#if QSSG_ENABLE_HEJLDAWSON_TONEMAPPING
+vec3 qt_tonemapHejlDawson(vec3 color)
 {
     color = max(vec3(0.0), color - vec3(0.004));
     return (color * (6.2 * color + 0.5)) / (color * (6.2 * color + 1.7) + 0.06);
@@ -111,9 +111,9 @@ vec3 qt_tonemap(vec3 color)
 #if QSSG_ENABLE_ACES_TONEMAPPING
     return qt_toneMapACES(color);
 #endif
-    // Hejl Richard
-#if QSSG_ENABLE_HEJLRICHARD_TONEMAPPING
-    return qt_tonemapHejlRichard(color);
+    // Hejl-Dawson
+#if QSSG_ENABLE_HEJLDAWSON_TONEMAPPING
+    return qt_tonemapHejlDawson(color);
 #endif
 
     // Filmic
diff --git a/src/runtimerender/res/rhishaders/compile.bat b/src/runtimerender/res/rhishaders/compile.bat
index 9ec36aad9662ab9d82e55000c2654f50d45fde71..aa75b417abe9b6a25ee96f0fa7570cf84261675c 100755
--- a/src/runtimerender/res/rhishaders/compile.bat
+++ b/src/runtimerender/res/rhishaders/compile.bat
@@ -77,12 +77,12 @@ qsb --glsl "300 es,150" --hlsl 50 --msl 12 --define QSSG_ENABLE_ACES_TONEMAPPING
 
 qsb --glsl "300 es,150" --hlsl 50 --msl 12 --define QSSG_ENABLE_ACES_TONEMAPPING --define QSSG_ENABLE_RGBE_LIGHT_PROBE -O -c -o skybox_rgbe_aces.vert.qsb skybox.vert
 qsb --glsl "300 es,150" --hlsl 50 --msl 12 --define QSSG_ENABLE_ACES_TONEMAPPING --define QSSG_ENABLE_RGBE_LIGHT_PROBE -O -c -o skybox_rgbe_aces.frag.qsb skybox.frag
-:: Hejl Richard Tonemapping
-qsb --glsl "300 es,150" --hlsl 50 --msl 12 --define QSSG_ENABLE_HEJLRICHARD_TONEMAPPING -O -c -o skybox_hdr_hejlrichard.vert.qsb skybox.vert
-qsb --glsl "300 es,150" --hlsl 50 --msl 12 --define QSSG_ENABLE_HEJLRICHARD_TONEMAPPING -O -c -o skybox_hdr_hejlrichard.frag.qsb skybox.frag
+:: Hejl Dawson Tonemapping
+qsb --glsl "300 es,150" --hlsl 50 --msl 12 --define QSSG_ENABLE_HEJLDAWSON_TONEMAPPING -O -c -o skybox_hdr_hejldawson.vert.qsb skybox.vert
+qsb --glsl "300 es,150" --hlsl 50 --msl 12 --define QSSG_ENABLE_HEJLDAWSON_TONEMAPPING -O -c -o skybox_hdr_hejldawson.frag.qsb skybox.frag
 
-qsb --glsl "300 es,150" --hlsl 50 --msl 12 --define QSSG_ENABLE_HEJLRICHARD_TONEMAPPING --define QSSG_ENABLE_RGBE_LIGHT_PROBE -O -c -o skybox_rgbe_hejlrichard.vert.qsb skybox.vert
-qsb --glsl "300 es,150" --hlsl 50 --msl 12 --define QSSG_ENABLE_HEJLRICHARD_TONEMAPPING --define QSSG_ENABLE_RGBE_LIGHT_PROBE -O -c -o skybox_rgbe_hejlrichard.frag.qsb skybox.frag
+qsb --glsl "300 es,150" --hlsl 50 --msl 12 --define QSSG_ENABLE_HEJLDAWSON_TONEMAPPING --define QSSG_ENABLE_RGBE_LIGHT_PROBE -O -c -o skybox_rgbe_hejldawson.vert.qsb skybox.vert
+qsb --glsl "300 es,150" --hlsl 50 --msl 12 --define QSSG_ENABLE_HEJLDAWSON_TONEMAPPING --define QSSG_ENABLE_RGBE_LIGHT_PROBE -O -c -o skybox_rgbe_hejldawson.frag.qsb skybox.frag
 :: Filmic Tonemapping
 qsb --glsl "300 es,150" --hlsl 50 --msl 12 --define QSSG_ENABLE_FILMIC_TONEMAPPING -O -c -o skybox_hdr_filmic.vert.qsb skybox.vert
 qsb --glsl "300 es,150" --hlsl 50 --msl 12 --define QSSG_ENABLE_FILMIC_TONEMAPPING -O -c -o skybox_hdr_filmic.frag.qsb skybox.frag
diff --git a/src/runtimerender/res/rhishaders/skybox.frag b/src/runtimerender/res/rhishaders/skybox.frag
index b5f9632db087c9748cfd4a4c755d5d0f2a5b19b0..d8286b366031216fb3fe6eb97eb94e9fc2305bb2 100644
--- a/src/runtimerender/res/rhishaders/skybox.frag
+++ b/src/runtimerender/res/rhishaders/skybox.frag
@@ -39,8 +39,8 @@ const float A = 2.51;
 }
 #endif
 
-#ifdef QSSG_ENABLE_HEJLRICHARD_TONEMAPPING
-vec3 qt_tonemapHejlRichard(vec3 color)
+#ifdef QSSG_ENABLE_HEJLDAWSON_TONEMAPPING
+vec3 qt_tonemapHejlDawson(vec3 color)
 {
     color = max(vec3(0.0), color - vec3(0.004));
     return (color * (6.2 * color + 0.5)) / (color * (6.2 * color + 1.7) + 0.06);
@@ -74,9 +74,9 @@ vec3 qt_tonemap(vec3 color)
 #ifdef QSSG_ENABLE_ACES_TONEMAPPING
     return qt_toneMapACES(color);
 #endif
-    // Hejl Richard
-#ifdef QSSG_ENABLE_HEJLRICHARD_TONEMAPPING
-    return qt_tonemapHejlRichard(color);
+    // Hejl-Dawson
+#ifdef QSSG_ENABLE_HEJLDAWSON_TONEMAPPING
+    return qt_tonemapHejlDawson(color);
 #endif
 
     // FILMIC
diff --git a/src/runtimerender/res/rhishaders/skybox_hdr_hejlrichard.frag.qsb b/src/runtimerender/res/rhishaders/skybox_hdr_hejldawson.frag.qsb
similarity index 100%
rename from src/runtimerender/res/rhishaders/skybox_hdr_hejlrichard.frag.qsb
rename to src/runtimerender/res/rhishaders/skybox_hdr_hejldawson.frag.qsb
diff --git a/src/runtimerender/res/rhishaders/skybox_hdr_hejlrichard.vert.qsb b/src/runtimerender/res/rhishaders/skybox_hdr_hejldawson.vert.qsb
similarity index 100%
rename from src/runtimerender/res/rhishaders/skybox_hdr_hejlrichard.vert.qsb
rename to src/runtimerender/res/rhishaders/skybox_hdr_hejldawson.vert.qsb
diff --git a/src/runtimerender/res/rhishaders/skybox_rgbe_hejlrichard.frag.qsb b/src/runtimerender/res/rhishaders/skybox_rgbe_hejldawson.frag.qsb
similarity index 100%
rename from src/runtimerender/res/rhishaders/skybox_rgbe_hejlrichard.frag.qsb
rename to src/runtimerender/res/rhishaders/skybox_rgbe_hejldawson.frag.qsb
diff --git a/src/runtimerender/res/rhishaders/skybox_rgbe_hejlrichard.vert.qsb b/src/runtimerender/res/rhishaders/skybox_rgbe_hejldawson.vert.qsb
similarity index 100%
rename from src/runtimerender/res/rhishaders/skybox_rgbe_hejlrichard.vert.qsb
rename to src/runtimerender/res/rhishaders/skybox_rgbe_hejldawson.vert.qsb
diff --git a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_hejlrichard.qml b/tests/auto/quick3d_lancelot/data/layers/Tonemapping_hejldawson.qml
similarity index 98%
rename from tests/auto/quick3d_lancelot/data/layers/Tonemapping_hejlrichard.qml
rename to tests/auto/quick3d_lancelot/data/layers/Tonemapping_hejldawson.qml
index 8bd688e2f42838fb38694fe625fdb115b24a670d..28b3f55d1d268b83a5ab7eafc2a289b6583ff6b3 100644
--- a/tests/auto/quick3d_lancelot/data/layers/Tonemapping_hejlrichard.qml
+++ b/tests/auto/quick3d_lancelot/data/layers/Tonemapping_hejldawson.qml
@@ -63,7 +63,7 @@ Rectangle {
         environment: SceneEnvironment {
             backgroundMode: SceneEnvironment.SkyBox
             lightProbe: layer_lightprobe
-            tonemapMode: SceneEnvironment.TonemapModeHejlRichard
+            tonemapMode: SceneEnvironment.TonemapModeHejlDawson
         }
 
         PerspectiveCamera {