diff --git a/ChartingSpace/TimeMachine.js b/ChartingSpace/TimeMachine.js
index e2d088582..a047212f4 100644
--- a/ChartingSpace/TimeMachine.js
+++ b/ChartingSpace/TimeMachine.js
@@ -683,8 +683,8 @@ function newTimeMachine() {
 
         for (let i = 0; i < thisObject.timelineCharts.length; i++) {
             let timelinechart = thisObject.timelineCharts[i]
-            if (timelinechart.layersManager !== undefined) {
-                let layers = timelinechart.layersManager.layers
+            if (timelinechart.layerManager !== undefined) {
+                let layers = timelinechart.layerManager.layers
                 for (let j = 0; j < layers.length; j++) {
                     let layer = layers[j]
 
diff --git a/ChartingSpace/TimelineChart.js b/ChartingSpace/TimelineChart.js
index f2b71726f..ccc30ce56 100644
--- a/ChartingSpace/TimelineChart.js
+++ b/ChartingSpace/TimelineChart.js
@@ -13,7 +13,7 @@ function newTimelineChart() {
         rateScale: undefined,
         timeFrameScale: undefined,
         payload: undefined,
-        layersManager: undefined,
+        layerManager: undefined,
         plotterManager: undefined,
         upstreamTimeFrame: undefined,
         setDatetime: setDatetime,
@@ -64,8 +64,8 @@ function newTimelineChart() {
     function finalize() {
         timeMachineCoordinateSystem.eventHandler.stopListening(scaleChangedEventSubscriptionId)
 
-        if (thisObject.layersManager !== undefined) {
-            finalizeLayersManager()
+        if (thisObject.layerManager !== undefined) {
+            finalizeLayerManager()
         }
 
         if (thisObject.rateScale !== undefined) {
@@ -93,12 +93,12 @@ function newTimelineChart() {
         layersPanelHandle = undefined
     }
 
-    function finalizeLayersManager() {
+    function finalizeLayerManager() {
         if (thisObject.plotterManager !== undefined) {
             thisObject.plotterManager.finalize()
         }
         thisObject.plotterManager = undefined
-        thisObject.layersManager = undefined
+        thisObject.layerManager = undefined
 
         canvas.panelsSpace.destroyPanel(layersPanelHandle)
     }
@@ -171,12 +171,12 @@ function newTimelineChart() {
         )
     }
 
-    function initializeLayersManager() {
+    function initializeLayerManager() {
         let owner = thisObject.payload.node.payload.parentNode.id // The real owner is the Time Machine
         layersPanelHandle = canvas.panelsSpace.createNewPanel('Layers Panel', undefined, owner)
-        thisObject.layersManager = canvas.panelsSpace.getPanel(layersPanelHandle)
-        thisObject.layersManager.payload = thisObject.payload.node.layersManager.payload
-        thisObject.layersManager.initialize()
+        thisObject.layerManager = canvas.panelsSpace.getPanel(layersPanelHandle)
+        thisObject.layerManager.payload = thisObject.payload.node.layerManager.payload
+        thisObject.layerManager.initialize()
 
         /* Initialize the Plotter Manager */
         thisObject.plotterManager = newPlottersManager()
@@ -188,7 +188,7 @@ function newTimelineChart() {
 
         thisObject.plotterManager.fitFunction = thisObject.fitFunction
         thisObject.plotterManager.payload = thisObject.payload
-        thisObject.plotterManager.initialize(thisObject.layersManager)
+        thisObject.plotterManager.initialize(thisObject.layerManager)
         thisObject.plotterManager.setTimeFrame(timeFrame)
         thisObject.plotterManager.setDatetime(datetime)
         thisObject.plotterManager.setCoordinateSystem(coordinateSystem)
@@ -314,7 +314,7 @@ function newTimelineChart() {
         thisObjectPhysics()
         childrenPhysics()
         syncWithDesignerScales()
-        syncWithDesignerLayersManager()
+        syncWithDesignerLayerManager()
     }
 
     function thisObjectPhysics() {
@@ -328,17 +328,17 @@ function newTimelineChart() {
         }
     }
 
-    function syncWithDesignerLayersManager() {
+    function syncWithDesignerLayerManager() {
         if (thisObject.payload.node === undefined) {
-            finalizeLayersManager()
+            finalizeLayerManager()
             return
         }
 
-        if (thisObject.payload.node.layersManager === undefined && thisObject.layersManager !== undefined) {
-            finalizeLayersManager()
+        if (thisObject.payload.node.layerManager === undefined && thisObject.layerManager !== undefined) {
+            finalizeLayerManager()
         }
-        if (thisObject.payload.node.layersManager !== undefined && thisObject.layersManager === undefined) {
-            initializeLayersManager()
+        if (thisObject.payload.node.layerManager !== undefined && thisObject.layerManager === undefined) {
+            initializeLayerManager()
         }
     }
 
diff --git a/DesignSpace/Workspace/FunctionLibraries/ChartingSpaceFunctions.js b/DesignSpace/Workspace/FunctionLibraries/ChartingSpaceFunctions.js
index 1caed64a7..d549a98da 100644
--- a/DesignSpace/Workspace/FunctionLibraries/ChartingSpaceFunctions.js
+++ b/DesignSpace/Workspace/FunctionLibraries/ChartingSpaceFunctions.js
@@ -140,13 +140,13 @@ function newChartingSpaceFunctions() {
             */
             mineProduct.payload.uiObject.invisiblePhysics()
             timelineChart.name = mineProduct.name
-            timelineChart.layersManager.payload.referenceParent = mineProduct
+            timelineChart.layerManager.payload.referenceParent = mineProduct
             timelineChart.payload.floatingObject.collapseToggle()
-            timelineChart.layersManager.payload.floatingObject.collapseToggle()
+            timelineChart.layerManager.payload.floatingObject.collapseToggle()
             timelineChart.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_180
-            timelineChart.layersManager.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_180
+            timelineChart.layerManager.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_180
 
-            let menu = timelineChart.layersManager.payload.uiObject.menu
+            let menu = timelineChart.layerManager.payload.uiObject.menu
             menu.internalClick('Add All Mine Layers')
             menu.internalClick('Add All Mine Layers')
         }
@@ -170,13 +170,13 @@ function newChartingSpaceFunctions() {
             for (let k = 0; k < 3; k++) {
                 let timelineChart = functionLibraryUiObjectsFromNodes.addUIObject(timeMachine, 'Timeline Chart')
 
-                timelineChart.layersManager.payload.referenceParent = mineProduct
+                timelineChart.layerManager.payload.referenceParent = mineProduct
                 timelineChart.payload.floatingObject.collapseToggle()
-                timelineChart.layersManager.payload.floatingObject.collapseToggle()
+                timelineChart.layerManager.payload.floatingObject.collapseToggle()
                 timelineChart.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_180
-                timelineChart.layersManager.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_180
+                timelineChart.layerManager.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_180
 
-                let menu = timelineChart.layersManager.payload.uiObject.menu
+                let menu = timelineChart.layerManager.payload.uiObject.menu
                 menu.internalClick('Add All Mine Layers')
                 menu.internalClick('Add All Mine Layers')
 
@@ -201,7 +201,7 @@ function newChartingSpaceFunctions() {
                     }
                 }
                 function deleteNodeByName(nodeName) {
-                    let nodeToDelete = findNodeInNodeMesh(timelineChart.layersManager, undefined, nodeName, true, true, false, false)
+                    let nodeToDelete = findNodeInNodeMesh(timelineChart.layerManager, undefined, nodeName, true, true, false, false)
                     if (nodeToDelete === undefined) { return }
                     functionLibraryNodeDeleter.deleteUIObject(nodeToDelete, rootNodes)
                 }