diff --git a/src/Gui/PreferencePages/DlgSettingsLightSources.cpp b/src/Gui/PreferencePages/DlgSettingsLightSources.cpp
index b7f9423985..9eaa6f2c8b 100644
--- a/src/Gui/PreferencePages/DlgSettingsLightSources.cpp
+++ b/src/Gui/PreferencePages/DlgSettingsLightSources.cpp
@@ -194,7 +194,7 @@ void DlgSettingsLightSources::loadDirection()
 void DlgSettingsLightSources::toggleLight(bool on)
 {
     if (view) {
-        view->getHeadlight()->on = on;
+        view->setHeadlightEnabled(on);
     }
 }
 
diff --git a/src/Gui/View3DInventorViewer.cpp b/src/Gui/View3DInventorViewer.cpp
index ee2a800766..96403eda42 100644
--- a/src/Gui/View3DInventorViewer.cpp
+++ b/src/Gui/View3DInventorViewer.cpp
@@ -1407,12 +1407,12 @@ SoDirectionalLight* View3DInventorViewer::getBacklight() const
     return this->backlight;
 }
 
-void View3DInventorViewer::setBacklight(SbBool on)
+void View3DInventorViewer::setBacklightEnabled(bool on)
 {
     this->backlight->on = on;
 }
 
-SbBool View3DInventorViewer::isBacklight() const
+bool View3DInventorViewer::isBacklightEnabled() const
 {
     return this->backlight->on.getValue();
 }
diff --git a/src/Gui/View3DInventorViewer.h b/src/Gui/View3DInventorViewer.h
index 0f0edfb429..6b2a596d4b 100644
--- a/src/Gui/View3DInventorViewer.h
+++ b/src/Gui/View3DInventorViewer.h
@@ -153,8 +153,8 @@ public:
     void onSelectionChanged(const SelectionChanges &Reason) override;
 
     SoDirectionalLight* getBacklight() const;
-    void setBacklight(SbBool on);
-    SbBool isBacklight() const;
+    void setBacklightEnabled(bool on);
+    bool isBacklightEnabled() const;
     void setSceneGraph (SoNode *root) override;
     SbBool searchNode(SoNode*) const;
 
diff --git a/src/Gui/View3DSettings.cpp b/src/Gui/View3DSettings.cpp
index e248e6fa06..d7c7ae7345 100644
--- a/src/Gui/View3DSettings.cpp
+++ b/src/Gui/View3DSettings.cpp
@@ -112,7 +112,7 @@ void View3DSettings::OnChange(ParameterGrp::SubjectType &rCaller,ParameterGrp::M
     if (strcmp(Reason,"EnableHeadlight") == 0) {
         bool enable = rGrp.GetBool("EnableHeadlight", true);
         for (auto _viewer : _viewers) {
-            _viewer->getHeadlight()->on.setValue(enable);
+            _viewer->setHeadlightEnabled(enable);
         }
     }
     else if (strcmp(Reason,"HeadlightColor") == 0) {
@@ -144,7 +144,7 @@ void View3DSettings::OnChange(ParameterGrp::SubjectType &rCaller,ParameterGrp::M
     }
     else if (strcmp(Reason,"EnableBacklight") == 0) {
         for (auto _viewer : _viewers) {
-            _viewer->setBacklight(rGrp.GetBool("EnableBacklight", false));
+            _viewer->setBacklightEnabled(rGrp.GetBool("EnableBacklight", false));
         }
     }
     else if (strcmp(Reason,"BacklightColor") == 0) {