diff --git a/Scripts/AppLoader.js b/Scripts/AppLoader.js
index aa68afbe2..0923a0e98 100644
--- a/Scripts/AppLoader.js
+++ b/Scripts/AppLoader.js
@@ -51,7 +51,7 @@ function newAppLoader () {
         'ControlsToolBox/SidePanel.js',
         'ControlsToolBox/SidePanelTab.js',
 
-        'Spaces/BottomSpace.js',
+        'Spaces/CockpitSpace.js',
         'Spaces/TopSpace.js',
         'Spaces/PanelsSpace.js',
         'Spaces/ChartSpace.js',
@@ -90,7 +90,7 @@ function newAppLoader () {
         'ChartsSpace/ViewPort.js',
         'ChartsSpace/TimeLineCoordinateSystem.js',
 
-        'BottomSpace/UIControl.js',
+        'CockpitSpace/UIControl.js',
 
         'Plotter.js',
         'PlotterPanel.js',
diff --git a/server.js b/server.js
index 826479d03..f8c4d9294 100644
--- a/server.js
+++ b/server.js
@@ -455,9 +455,9 @@ function onBrowserRequest (request, response) {
       }
       break
 
-    case 'BottomSpace': // This means the BottomSpace folder.
+    case 'CockpitSpace': // This means the CockpitSpace folder.
       {
-        respondWithFile(serverConfig.pathToCanvasApp + '/BottomSpace/' + requestParameters[2], response)
+        respondWithFile(serverConfig.pathToCanvasApp + '/CockpitSpace/' + requestParameters[2], response)
       }
       break