diff --git a/scripts/developer/utilities/lib/skit/Page.js b/scripts/developer/utilities/lib/skit/Page.js
index 189c26044a..9cdd084fa5 100644
--- a/scripts/developer/utilities/lib/skit/Page.js
+++ b/scripts/developer/utilities/lib/skit/Page.js
@@ -60,7 +60,7 @@ Page.prototype.createView = function () {
 };
 
 
-Pages = function (relativePath) {
+function Pages(relativePath) {
     print(relativePath)
     this._relativePath = relativePath
     this._pages = {};
@@ -104,4 +104,10 @@ Pages.prototype.sendTo = function (command, message) {
     this._pages[command].window.sendToQml(message);
 };
 
+
+module.exports = {
+    Page: Page,
+    Pages: Pages
+}
+
 }()); 
diff --git a/scripts/developer/utilities/render/luci.js b/scripts/developer/utilities/render/luci.js
index 3b832bdfb4..089c72c11d 100644
--- a/scripts/developer/utilities/render/luci.js
+++ b/scripts/developer/utilities/render/luci.js
@@ -6,7 +6,7 @@ var Page = Script.require('../lib/skit/Page.js');
 
 
 function openView() {
-    var pages = new Pages(Script.resolvePath("."));
+    var pages = new Page.Pages(Script.resolvePath("."));
 
     function fromQml(message) {
         if (pages.open(message.method)) {
diff --git a/scripts/developer/utilities/render/luci/Bloom.qml b/scripts/developer/utilities/render/luci/Bloom.qml
index 7db75d94ef..22b6f918c4 100644
--- a/scripts/developer/utilities/render/luci/Bloom.qml
+++ b/scripts/developer/utilities/render/luci/Bloom.qml
@@ -16,7 +16,7 @@ Column {
 
     id: bloom
 
-    property var config: Render.getConfig("RenderMainView.DebugBloom")
+    property var config: Render.getConfig("RenderMainView.Bloom.DebugBloom")
 
     Prop.PropBool {
         label: "Apply Bloom"
diff --git a/scripts/developer/utilities/render/luci/BoundingBoxes.qml b/scripts/developer/utilities/render/luci/BoundingBoxes.qml
index 6b34e41b4c..15629dc185 100644
--- a/scripts/developer/utilities/render/luci/BoundingBoxes.qml
+++ b/scripts/developer/utilities/render/luci/BoundingBoxes.qml
@@ -16,7 +16,7 @@ Column {
 
     id: root;   
     
-    property var mainViewTask: Render.getConfig("RenderMainView")
+    property var mainViewTask: Render.getConfig("RenderMainView.DebugRenderDeferredTask")
     
     spacing: 5
     anchors.left: parent.left
diff --git a/scripts/developer/utilities/render/luci/Culling.qml b/scripts/developer/utilities/render/luci/Culling.qml
index d881ddf7a6..548b6908b3 100644
--- a/scripts/developer/utilities/render/luci/Culling.qml
+++ b/scripts/developer/utilities/render/luci/Culling.qml
@@ -19,8 +19,8 @@ Column {
     anchors.left: parent.left;
     anchors.right: parent.right;
 
-    property var sceneOctree: Render.getConfig("RenderMainView.DrawSceneOctree");
-    property var itemSelection: Render.getConfig("RenderMainView.DrawItemSelection");
+    property var sceneOctree: Render.getConfig("RenderMainView.DebugRenderDeferredTask.DrawSceneOctree");
+    property var itemSelection: Render.getConfig("RenderMainView.DebugRenderDeferredTask.DrawItemSelection");
 
      Component.onCompleted: {
         sceneOctree.enabled = true;
@@ -35,8 +35,8 @@ Column {
     Component.onDestruction: {
         sceneOctree.enabled = false;
         itemSelection.enabled = false;
-        Render.getConfig("RenderMainView.FetchSceneSelection").freezeFrustum = false;
-        Render.getConfig("RenderMainView.CullSceneSelection").freezeFrustum = false;
+        Render.getConfig("RenderMainView.DebugRenderDeferredTask.FetchSceneSelection").freezeFrustum = false;
+        Render.getConfig("RenderMainView.DebugRenderDeferredTask.CullSceneSelection").freezeFrustum = false;
     }
 
     GroupBox {
@@ -54,8 +54,8 @@ Column {
                     text: "Freeze Culling Frustum"
                     checked: false
                     onCheckedChanged: {
-                        Render.getConfig("RenderMainView.FetchSceneSelection").freezeFrustum = checked;
-                        Render.getConfig("RenderMainView.CullSceneSelection").freezeFrustum = checked;
+                        Render.getConfig("RenderMainView.DebugRenderDeferredTask.FetchSceneSelection").freezeFrustum = checked;
+                        Render.getConfig("RenderMainView.DebugRenderDeferredTask.CullSceneSelection").freezeFrustum = checked;
                     }
                 }
                 Label {
@@ -112,9 +112,9 @@ Column {
             anchors.left: parent.left;
             anchors.right: parent.right;
             Repeater {
-                model: [ "Opaque:RenderMainView.DrawOpaqueDeferred", "Transparent:RenderMainView.DrawTransparentDeferred", "Light:RenderMainView.DrawLight",
-                        "Opaque InFront:RenderMainView.DrawInFrontOpaque", "Transparent InFront:RenderMainView.DrawInFrontTransparent",
-                        "Opaque HUD:RenderMainView.DrawHUDOpaque", "Transparent HUD:RenderMainView.DrawHUDTransparent" ]
+                model: [ "Opaque:RenderMainView.DebugRenderDeferredTask.DrawOpaqueDeferred", "Transparent:RenderMainView.DebugRenderDeferredTask.DrawTransparentDeferred", "Light:RenderMainView.DebugRenderDeferredTask.DrawLight",
+                        "Opaque InFront:RenderMainView.DebugRenderDeferredTask.DrawInFrontOpaque", "Transparent InFront:RenderMainView.DebugRenderDeferredTask.DrawInFrontTransparent",
+                        "Opaque HUD:RenderMainView.DebugRenderDeferredTask.DrawHUDOpaque", "Transparent HUD:RenderMainView.DebugRenderDeferredTask.DrawHUDTransparent" ]
                 Prop.PropScalar {
                     label: qsTr(modelData.split(":")[0])
                     integral: true
diff --git a/scripts/developer/utilities/render/luci/Framebuffer.qml b/scripts/developer/utilities/render/luci/Framebuffer.qml
index dd2b57d085..b7a992c589 100644
--- a/scripts/developer/utilities/render/luci/Framebuffer.qml
+++ b/scripts/developer/utilities/render/luci/Framebuffer.qml
@@ -18,7 +18,7 @@ Column {
 
     id: framebuffer
 
-    property var config: Render.getConfig("RenderMainView.DebugDeferredBuffer")
+    property var config: Render.getConfig("RenderMainView.DebugRenderDeferredTask.DebugDeferredBuffer")
 
     function setDebugMode(mode) {
         framebuffer.config.enabled = (mode != 0);
diff --git a/scripts/developer/utilities/render/luci/ShadingModel.qml b/scripts/developer/utilities/render/luci/ShadingModel.qml
index afeca5a204..76b01f8a93 100644
--- a/scripts/developer/utilities/render/luci/ShadingModel.qml
+++ b/scripts/developer/utilities/render/luci/ShadingModel.qml
@@ -79,7 +79,7 @@ Column {
                         "Point:LightingModel:enablePointLight",
                         "Spot:LightingModel:enableSpotLight",
                         "Light Contour:LightingModel:showLightContour",
-                        "Zone Stack:DrawZoneStack:enabled",
+                        "Zone Stack:DebugRenderDeferredTask.DrawZoneStack:enabled",
                         "Shadow:LightingModel:enableShadow"
                 ]
                 Prop.PropCheckBox {