Merge branch 'master' of github.com:OpenSpace/OpenSpace

2026-01-04 18:51:17 -06:00 · 2018-03-28 16:22:09 +02:00
parent 48880db372 1ede0a2f21
commit 04ff9d119b
687 changed files with 32276 additions and 4245 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,12 @@ install_manifest.txt
 .cproject
 .project
 shaders/ABuffer/constants.hglsl
-ScriptLog.txt
+*.idea/
+.vs/
+.build-vs/
+*.dir
+cmake-build-*
+x64/
 customization.lua
 COMMIT.md
 screenshots
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,6 +79,18 @@ execute_process(
  OUTPUT_STRIP_TRAILING_WHITESPACE
 )

+# See if working directory is clean or not
+execute_process(
+  COMMAND git diff-index --quiet HEAD --
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  RESULT_VARIABLE OPENSPACE_GIT_STATUS_RETURN
+)
+if (NOT OPENSPACE_GIT_STATUS_RETURN EQUAL 0) 
+    set(OPENSPACE_GIT_STATUS "uncomitted changes")
+else()
+    set(OPENSPACE_GIT_STATUS "")
+endif()
+
 option(OPENSPACE_WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)

 include(src/CMakeLists.txt)
--- a/2
+++ b/2
@@ -54,7 +54,7 @@ stage('Build') {
                        cd build
                        cmake -G "Visual Studio 15 2017 Win64" .. ''' +
                        flags + ''' ..
-                        msbuild.exe OpenSpace.sln /nologo /verbosity:minimal /p:Configuration=Debug
+                        msbuild.exe OpenSpace.sln /nologo /verbosity:minimal /p:Configuration=Debug /target:OpenSpace
                    '''
                }
            }
--- a/apps/OpenSpace/CMakeLists.txt
+++ b/apps/OpenSpace/CMakeLists.txt
@@ -22,11 +22,10 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${GHOUL_BASE_DIR}/support/cmake/copy_shared_libraries.cmake) 
+include(${GHOUL_BASE_DIR}/support/cmake/copy_shared_libraries.cmake)
 include(${OPENSPACE_CMAKE_EXT_DIR}/application_definition.cmake)
 include(${OPENSPACE_CMAKE_EXT_DIR}/global_variables.cmake)

-
 #####
 # OpenVR
 #####
@@ -34,9 +33,9 @@ option(OPENSPACE_OPENVR_SUPPORT "Build OpenSpace application with OpenVR support

 if (OPENSPACE_OPENVR_SUPPORT)
    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${OPENSPACE_EXT_DIR}/sgct/cmake/modules/")
-    
+
    find_package(OpenVR REQUIRED)
-    
+
    set(SGCT_OPENVR_DEFINITIONS OPENVR_SUPPORT)

    if (NOT SGCT_OPENVR_INCLUDE_DIRECTORY)
@@ -111,6 +110,38 @@ target_compile_definitions(OpenSpace PRIVATE
    ${SPOUT_DEFINITIONS}
 )

+
+# Web Browser and Web gui
+# Why not put these in the module's path? Because they do not have access to the
+# target as of July 2017, which is needed.
+if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT)
+    # wanted by CEF
+    set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE")
+    
+    if (WIN32)
+        set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc)
+    endif ()
+
+    # Add the CEF binary distribution's cmake/ directory to the module path and
+    # find CEF to initialize it properly.
+    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBBROWSER_MODULE_PATH}/cmake")
+    include(webbrowser_helpers)
+
+    set_cef_targets("${CEF_ROOT}" OpenSpace)
+    run_cef_platform_config("${CEF_ROOT}" "${CEF_TARGET}" "${WEBBROWSER_MODULE_PATH}")
+elseif (OPENSPACE_MODULE_WEBBROWSER)
+    message(WARNING "Web configured to be included, but no CEF_ROOT was found, please try configuring CMake again.")
+endif ()
+
+if (OPENSPACE_MODULE_WEBGUI AND WEBGUI_MODULE_PATH)
+    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBGUI_MODULE_PATH}/cmake")
+    include(webgui_helpers)
+    build_webgui_source(OpenSpace)
+elseif(OPENSPACE_MODULE_WEBGUI)
+    message(WARNING "WebGui is configured to be included, but the web source could not be found. Try configuring CMake again.")
+endif()
+# End Web Browser and Web gui
+
 if (MSVC)
    # This library is used for being able to output the callstack if an exception escapes
    target_link_libraries(OpenSpace Dbghelp.lib)
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -106,7 +106,7 @@ LONG WINAPI generateMiniDump(EXCEPTION_POINTERS* exceptionPointers) {

    LINFO(fmt::format("Creating dump file: {}", dumpFile));

-    HANDLE hDumpFile = CreateFile(
+    HANDLE hDumpFile = CreateFileA(
        dumpFile.c_str(),
        GENERIC_READ | GENERIC_WRITE,
        FILE_SHARE_WRITE | FILE_SHARE_READ,
--- a/apps/Wormhole/CMakeLists.txt
+++ b/apps/Wormhole/CMakeLists.txt
@@ -0,0 +1,45 @@
+##########################################################################################
+#                                                                                        #
+# OpenSpace                                                                              #
+#                                                                                        #
+# Copyright (c) 2014-2018                                                                #
+#                                                                                        #
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
+# software and associated documentation files (the "Software"), to deal in the Software  #
+# without restriction, including without limitation the rights to use, copy, modify,     #
+# merge, publish, distribute, sublicense, and/or sell copies of the Software, and to     #
+# permit persons to whom the Software is furnished to do so, subject to the following    #
+# conditions:                                                                            #
+#                                                                                        #
+# The above copyright notice and this permission notice shall be included in all copies  #
+# or substantial portions of the Software.                                               #
+#                                                                                        #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,    #
+# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A          #
+# PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT     #
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF   #
+# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE   #
+# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
+##########################################################################################
+
+include(${OPENSPACE_CMAKE_EXT_DIR}/application_definition.cmake)
+
+set_source_files_properties(
+    ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns
+    PROPERTIES MACOSX_PACKAGE_LOCATION "Resources"
+)
+
+set(MACOSX_BUNDLE_ICON_FILE openspace.icns)
+
+create_new_application(
+    Wormhole
+    MACOSX_BUNDLE
+    ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/openspace.rc
+    ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns
+)
+
+target_link_libraries(
+    Wormhole
+    libOpenSpace
+)
--- a/apps/Wormhole/include.cmake
+++ b/apps/Wormhole/include.cmake
@@ -0,0 +1 @@
+set(DEFAULT_APPLICATION ON)
--- a/apps/Wormhole/main.cpp
+++ b/apps/Wormhole/main.cpp
@@ -0,0 +1,141 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2018                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+
+#include <ghoul/opengl/ghoul_gl.h>
+
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/filesystem/directory.h>
+#include <ghoul/logging/logmanager.h>
+#include <ghoul/logging/consolelog.h>
+#include <ghoul/ghoul.h>
+#include <ghoul/cmdparser/commandlineparser.h>
+#include <ghoul/cmdparser/singlecommand.h>
+
+#include <openspace/engine/wrapper/windowwrapper.h>
+#include <openspace/scripting/scriptengine.h>
+#include <openspace/rendering/renderable.h>
+
+#include <openspace/network/parallelserver.h>
+
+#include <iostream>
+#include <string>
+#include <ghoul/glm.h>
+#include <functional>
+#include <sstream>
+#include <iomanip>
+#include <ios>
+
+namespace {
+    const std::string _loggerCat = "Wormhole";
+}
+
+int main(int argc, char** argv) {
+    using namespace openspace;
+
+    std::vector<std::string> arguments(argv, argv + argc);
+
+    ghoul::cmdparser::CommandlineParser commandlineParser(
+        "Wormhole",
+        ghoul::cmdparser::CommandlineParser::AllowUnknownCommands::Yes
+    );
+
+    std::stringstream defaultPassword;
+    defaultPassword << std::hex << std::setfill('0') << std::setw(6) << 
+        (std::hash<size_t>{}(
+            std::chrono::system_clock::now().time_since_epoch().count()
+        ) % 0xffffff);
+
+    std::stringstream defaultChangeHostPassword;
+    defaultChangeHostPassword << std::hex << std::setfill('0') << std::setw(6) <<
+        (std::hash<size_t>{}(
+            std::chrono::system_clock::now().time_since_epoch().count() + 1
+        ) % 0xffffff);
+
+    std::string portString = "";
+    commandlineParser.addCommand(
+        std::make_unique<ghoul::cmdparser::SingleCommand<std::string>>(
+            portString,
+            "--port",
+            "-p",
+            "Sets the port to listen on"
+            )
+    );
+
+    std::string password = "";
+    commandlineParser.addCommand(
+        std::make_unique<ghoul::cmdparser::SingleCommand<std::string>>(
+            password,
+            "--password",
+            "-l",
+            "Sets the password to use"
+            )
+    );
+
+    std::string changeHostPassword = "";
+    commandlineParser.addCommand(
+        std::make_unique<ghoul::cmdparser::SingleCommand<std::string>>(
+            changeHostPassword,
+            "--hostpassword",
+            "-h",
+            "Sets the host password to use"
+            )
+    );
+
+    commandlineParser.setCommandLine(arguments);
+    commandlineParser.execute();
+
+    if (password == "") {
+        password = defaultPassword.str();
+    }
+    if (changeHostPassword == "") {
+        changeHostPassword = defaultChangeHostPassword.str();
+    }
+
+    LINFO(fmt::format("Connection password: {}", password));
+    LINFO(fmt::format("Host password: {}", changeHostPassword));
+
+    int port = 25001;
+
+    if (portString != "") {
+        try {
+            port = std::stoi(portString);
+        }
+        catch (...) {
+            LERROR(fmt::format("Invalid port: {}", portString));
+        }
+    }
+
+    ParallelServer server;
+    server.start(port, password, changeHostPassword);
+    server.setDefaultHostAddress("127.0.0.1");
+    LINFO(fmt::format("Server listening to port {}", port));
+
+    while (std::cin.get() != 'q') {}
+
+    server.stop();
+    LINFO("Server stopped");
+
+    return 0;
+};
--- a/apps/Wormhole/openspace.icns
+++ b/apps/Wormhole/openspace.icns
--- a/apps/Wormhole/openspace.ico
+++ b/apps/Wormhole/openspace.ico
--- a/apps/Wormhole/openspace.png
+++ b/apps/Wormhole/openspace.png
--- a/apps/Wormhole/openspace.rc
+++ b/apps/Wormhole/openspace.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "openspace.ico"
--- a/data/assets/dawn.scene
+++ b/data/assets/dawn.scene
@@ -37,7 +37,7 @@ asset.onInitialize(function ()
    )

    openspace.navigation.setCameraState({
-        Focus = DawnAsset.Dawn.Name,
+        Focus = DawnAsset.Dawn.Identifier,
        Position = { 526781518487.171326, 257168309890.072144, -1381125204152.817383 },
        Rotation = { -0.106166, 0.981574, -0.084545, 0.134513 },
    })
--- a/data/assets/default.scene
+++ b/data/assets/default.scene
@@ -9,7 +9,6 @@ asset.require('scene/solarsystem/planets')
 asset.require('scene/solarsystem/planets/mars/moons/phobos')
 asset.require('scene/solarsystem/planets/mars/moons/deimos')
 assetHelper.requestAll(asset, 'scene/digitaluniverse')
-
 -- Load default key bindings applicable to most scenes
 asset.require('util/default_keybindings')

@@ -37,10 +36,9 @@ local Keybindings = {
        Key = "g",
        Command = propertyHelper.invert('Scene.MilkyWay.renderable.Enabled') ..
                  propertyHelper.invert('Scene.Stars.renderable.Enabled') ..
-                  propertyHelper.invert('Scene.Earth.RenderableGlobe.Layers.NightLayers.Earth at Night 2012.Enabled') ..
-                  propertyHelper.invert('Scene.Earth.RenderableGlobe.PerformShading') ..
-                  propertyHelper.invert('Scene.Mars.RenderableGlobe.PerformShading') ..
-                  propertyHelper.invert('Scene.Earth.RenderableGlobe.Atmosphere') ..
+                  propertyHelper.invert('Scene.Earth.RenderableGlobe.Layers.NightLayers.Earth_at_Night_2012.Enabled') ..
+                  propertyHelper.invert('Scene.EarthAtmosphere.renderable.Enabled') ..
+                  propertyHelper.invert('Scene.MarsAtmosphere.renderable.Enabled') ..
                  propertyHelper.invert('Scene.Earth.RenderableGlobe.Layers.WaterMasks.MODIS_Water_Mask.Enabled') ..
                  propertyHelper.invert('Scene.Moon.RenderableGlobe.Enabled') ..
                  propertyHelper.invert('Scene.Sun.renderable.Enabled'),
@@ -72,7 +70,6 @@ asset.onInitialize(function ()
        "Earth", "Mars", "Moon"
    })

-
    openspace.addVirtualProperty(
        "BoolProperty",
        "Show Trails",
@@ -84,7 +81,7 @@ asset.onInitialize(function ()
    )

    openspace.navigation.setCameraState({
-        Focus = earthAsset.Earth.Name,
+        Focus = earthAsset.Earth.Identifier,
        Position = { 0, 0, 0 },
        Rotation = { 0.758797, 0.221490, -0.605693, -0.091135 },
    })
--- a/data/assets/examples/renderableplaneimageonline.asset
+++ b/data/assets/examples/renderableplaneimageonline.asset
@@ -6,8 +6,8 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")


 local RenderablePlaneImageOnline = {
-    Name = "RenderablePlaneImageOnline",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "RenderablePlaneImageOnline",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderablePlaneImageOnline",
        Size = 3.0E11,
@@ -15,7 +15,9 @@ local RenderablePlaneImageOnline = {
        Billboard = true,
        URL = "http://data.openspaceproject.com/examples/renderableplaneimageonline.jpg"
    },
-    GuiPath = "/Examples"
+    GUI = {
+        Path = "/Examples"
+    }
 }


--- a/data/assets/examples/screenspacespout.asset
+++ b/data/assets/examples/screenspacespout.asset
@@ -6,15 +6,17 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")


 local Spout = {
-    Name = "Spouty",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "Spouty",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderablePlaneSpout",
        Size = 3.0E11,
        Origin = "Center",
        Billboard = true
    },
-    GuiPath = "/Examples"
+    GUI = {
+        Path = "/Examples"
+    }
 }


--- a/data/assets/examples/urlsynchronization.asset
+++ b/data/assets/examples/urlsynchronization.asset
@@ -3,15 +3,15 @@
 local assetHelper = asset.require("util/asset_helper")

 asset.syncedResource({
-    Type = "UrlSynchronization",
    Name = "Example Single",
+    Type = "UrlSynchronization",
    Identifier = "example_single",
    Url = "http://celestrak.com/NORAD/elements/geo.txt"
 })

 asset.syncedResource({
-    Type = "UrlSynchronization",
    Name = "Example Multiple",
+    Type = "UrlSynchronization",
    Identifier = "example_multiple",
    Url = {
        "http://celestrak.com/NORAD/elements/stations.txt",
@@ -20,14 +20,23 @@ asset.syncedResource({
 })

 asset.syncedResource({
-    Type = "UrlSynchronization",
    Name = "Example Large",
+    Type = "UrlSynchronization",
    Identifier = "example_large",
-    Url = "http://ipv4.download.thinkbroadband.com/100MB.zip"
+    Url = "http://ipv4.download.thinkbroadband.com/100MB.zip",
+    Override = true
 })

 asset.syncedResource({
+    Name = "Example Medium",
    Type = "UrlSynchronization",
+    Identifier = "example_medium",
+    Url = "http://ipv4.download.thinkbroadband.com/5MB.zip",
+    Override = true
+})
+
+asset.syncedResource({
    Name = "Example No ident",
+    Type = "UrlSynchronization",
    Url = "http://ipv4.download.thinkbroadband.com/5MB.zip"
 })
--- a/data/assets/juno.scene
+++ b/data/assets/juno.scene
@@ -40,7 +40,7 @@ asset.onInitialize(function ()
    )

    openspace.navigation.setCameraState({
-        Focus = junoAsset.Juno.Name,
+        Focus = junoAsset.Juno.Identifier,
        Position = { 1837386367.601345, -389860693812.834839, 714830404470.398926 },
        Rotation = { -0.336540, 0.711402, -0.099212, 0.608937 },
    })
--- a/data/assets/newhorizons.scene
+++ b/data/assets/newhorizons.scene
@@ -101,7 +101,7 @@ local Keybindings = {
    },
    {
        Key = "l",
-        Command = propertyHelper.invert('Scene.Labels.renderable.Enabled'),
+        Command = propertyHelper.fadeInOut('Scene.Labels.renderable.Opacity', 2.0),
        Documentation = "Toggles the visibility of the labels for the New Horizons instruments.",
        Local = false
    },
@@ -177,7 +177,7 @@ asset.onInitialize(function ()
    )

    openspace.navigation.setCameraState({
-        Focus = NewHorizonsAsset.NewHorizons.Name,
+        Focus = NewHorizonsAsset.NewHorizons.Identifier,
        Position = { 4662120063743.592773, 1263245003503.724854, -955413856565.788086 },
        Rotation = { 0.683224, -0.165934, 0.701234, 0.118073 },
    })
--- a/data/assets/osirisrex.scene
+++ b/data/assets/osirisrex.scene
@@ -124,7 +124,7 @@ asset.onInitialize(function ()
    )

    openspace.navigation.setCameraState({
-        Focus = OsirisRexAsset.OsirisRex.Name,
+        Focus = OsirisRexAsset.OsirisRex.Identifier,
        Position = { 26974590199.661884, 76314608558.908020, -127086452897.101791 },
        Rotation = { 0.729548, -0.126024, 0.416827, 0.527382 },
    })
--- a/data/assets/rosetta.scene
+++ b/data/assets/rosetta.scene
@@ -126,7 +126,7 @@ asset.onInitialize(function ()
    )

    openspace.navigation.setCameraState({
-        Focus = Comet67PAsset.Comet67P.Name,
+        Focus = Comet67PAsset.Comet67P.Identifier,
        Position = { 526781518487.171326, 257168309890.072144, -1381125204152.817383 },
        Rotation = { -0.106166, 0.981574, -0.084545, 0.134513 },
    })
--- a/data/assets/scene/digitaluniverse/2dF.asset
+++ b/data/assets/scene/digitaluniverse/2dF.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "2dF Galaxies",
+    Identifier = "2dF",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -31,7 +31,10 @@ local object = {
        Unit = "Mpc",
        ScaleFactor = 508.0
    },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "2dF Galaxies",
+        Path = "/Universe/Galaxies"
+    }
 }


--- a/data/assets/scene/digitaluniverse/2mass.asset
+++ b/data/assets/scene/digitaluniverse/2mass.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "2MASS Galaxies",
+    Identifier = "2MASS",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -31,7 +31,10 @@ local object = {
        Unit = "Mpc",
        ScaleFactor = 508.0
    },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "2MASS Galaxies",
+        Path = "/Universe/Galaxies"
+    }
 }


--- a/data/assets/scene/digitaluniverse/6dF.asset
+++ b/data/assets/scene/digitaluniverse/6dF.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "6dF Galaxies",
+    Identifier = "6dF",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -30,7 +30,10 @@ local object = {
        ColorRange = { { 0.0, 0.075 }, { 1.0, 50.0 } },
        Unit = "Mpc"
    },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "6dF Galaxies",
+        Path = "/Universe/Galaxies"
+    }
 }


--- a/data/assets/scene/digitaluniverse/abell.asset
+++ b/data/assets/scene/digitaluniverse/abell.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "Abell Galaxy Clusters",
+    Identifier = "Abell",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -38,7 +38,10 @@ local object = {
            0.0,              0.0,            0.0,           1.0
        }
    },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "Abell Galaxy Clusters",
+        Path = "/Universe/Galaxies"
+    }
 }


--- a/data/assets/scene/digitaluniverse/alternatestarlabels.asset
+++ b/data/assets/scene/digitaluniverse/alternatestarlabels.asset
@@ -10,7 +10,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "Stars Labels - Alternate",
+    Identifier = "StarLabelsAlternate",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -23,7 +23,10 @@ local object = {
        TextMinSize = 6.0,
        Unit = "pc"
    },
-    GuiPath = "/Milky Way/Stars"
+    GUI = {
+        Name = "Stars Labels - Alternate",
+        Path = "/Milky Way/Stars"
+    }
 }


--- a/data/assets/scene/digitaluniverse/backgroundradiation.asset
+++ b/data/assets/scene/digitaluniverse/backgroundradiation.asset
@@ -17,49 +17,57 @@ local speck = asset.syncedResource({
 })

 local wmap = {
-    Name = "Wilkinson Microwave Anisotropy Probe (WMAP)",
+    Identifier = "WMAP",
    Renderable = {
        Type = "RenderableSphere",
        Enabled = false,
        Size = 3975.41417036064E23,
        Segments = 80,
-        Alpha = 0.5,
+        Opacity = 0.5,
        Texture = textures .. "/wmap_ilc_7yr_v4_200uK_RGB_sos.png",
        Orientation = "Inside/Outside",
        FadeInThreshould = 8E26

    },
-    GuiPath = "/Universe/Cosmic Microwave Background"
+    GUI = {
+        Name = "Wilkinson Microwave Anisotropy Probe (WMAP)",
+        Path = "/Universe/Cosmic Microwave Background"
+    }
 }

 local cbe = {
-    Name = "Cosmic Background Explorer",
+    Identifier = "CBE",
    Renderable = {
        Type = "RenderableSphere",
        Enabled = false,
        Size = 3975.41417036064E23,
        Segments = 80,
-        Alpha = 0.5,
+        Opacity = 0.5,
        Texture = textures .. "/COBErect.png",
        Orientation = "Inside/Outside",
        FadeInThreshould = 8E26
    },
-    GuiPath = "/Universe/Cosmic Microwave Background"
+    GUI = {
+        Name = "Cosmic Background Explorer",
+        Path = "/Universe/Cosmic Microwave Background"
+    }
 }

 local planck = {
-    Name = "Planck",
+    Identifier = "Planck",
    Renderable = {
        Type = "RenderableSphere",
        Enabled = false,
        Size = 3975.41417036064E23,
        Segments = 80,
-        Alpha = 0.3,
+        Opacity = 0.3,
        Texture = textures .. "/cmb4k.jpg",
        Orientation = "Inside/Outside",
        FadeInThreshould = 8E26
    },
-    GuiPath = "/Universe/Cosmic Microwave Background"
+    GUI = {
+        Path = "/Universe/Cosmic Microwave Background"
+    }
 }


--- a/data/assets/scene/digitaluniverse/clusters.asset
+++ b/data/assets/scene/digitaluniverse/clusters.asset
@@ -10,7 +10,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "Galaxy Cluster Labels",
+    Identifier = "GalaxyClusterLabels",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -23,7 +23,10 @@ local object = {
        TextMinSize = 8.0,
        Unit = "Mpc"
    },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "Galaxy Cluster Labels",
+        Path = "/Universe/Galaxies"
+    }
 }


--- a/data/assets/scene/digitaluniverse/constellationbounds.asset
+++ b/data/assets/scene/digitaluniverse/constellationbounds.asset
@@ -15,7 +15,7 @@ local zodiacs = {
 }

 local object = {
-    Name = "Constellation Bounds",
+    Identifier = "ConstellationBounds",
    Renderable = {
        Type = "RenderableConstellationBounds",
        Enabled = false,
@@ -34,7 +34,10 @@ local object = {
            Scale = 10e17
        }
    },
-    GuiPath = "/Milky Way/Constellations"
+    GUI = {
+        Name = "Constellation Bounds",
+        Path = "/Milky Way/Constellations"
+    }
 }


--- a/data/assets/scene/digitaluniverse/constellations.asset
+++ b/data/assets/scene/digitaluniverse/constellations.asset
@@ -10,7 +10,7 @@ local speck = asset.syncedResource({
 })

 local constellationsExtragalactic = {
-    Name = "Constellations (Extragalactic)",
+    Identifier = "ConstellationsExtragalactic",
    Renderable = {
        Type = "RenderableDUMeshes",
        Enabled = false,
@@ -26,11 +26,14 @@ local constellationsExtragalactic = {
        MeshColor = { { 0.6, 0.4, 0.4 }, { 0.8, 0.0, 0.0 }, { 0.0, 0.3, 0.8 } },
        Unit = "Mpc"
    },
-    GuiPath = "/Milky Way/Constellations"
+    GUI = {
+        Name = "Constellations (Extragalactic)",
+        Path = "/Milky Way/Constellations"
+    }
 }

 local constellations = {
-    Name = "Constellations",
+    Identifier = "Constellations",
    Renderable = {
        Type = "RenderableDUMeshes",
        Enabled = false,
@@ -46,7 +49,9 @@ local constellations = {
        MeshColor = { { 0.6, 0.4, 0.4 }, { 0.8, 0.0, 0.0 }, { 0.0, 0.3, 0.8 } },
        Unit = "pc"
    },
-    GuiPath = "/Milky Way/Constellations"
+    GUI = {
+        Path = "/Milky Way/Constellations"
+    }
 }


--- a/data/assets/scene/digitaluniverse/dwarfs.asset
+++ b/data/assets/scene/digitaluniverse/dwarfs.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "Dwarfs",
+    Identifier = "Dwarfs",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -32,7 +32,9 @@ local object = {
        ScaleFactor = 360,
        Unit = "pc"
    },
-    GuiPath = "/Milky Way/Brown Dwarfs"
+    GUI = {
+        Path = "/Milky Way/Brown Dwarfs"
+    }
 }


--- a/data/assets/scene/digitaluniverse/exoplanets.asset
+++ b/data/assets/scene/digitaluniverse/exoplanets.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "Exoplanets",
+    Identifier = "Exoplanets",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -34,7 +34,9 @@ local object = {
        TextMinSize = 10.0,
        Unit = "pc"
    },
-    GuiPath = "/Milky Way/Exoplanets"
+    GUI = {
+        Path = "/Milky Way/Exoplanets"
+    }
 }


--- a/data/assets/scene/digitaluniverse/globularclusters.asset
+++ b/data/assets/scene/digitaluniverse/globularclusters.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "Globular Clusters",
+    Identifier = "GlobularClusters",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -33,7 +33,10 @@ local object = {
        TextMinSize = 10.0,
        Unit = "pc"
    },
-    GuiPath = "/Milky Way/Globular Clusters"
+    GUI = {
+        Name = "Globular Clusters",
+        Path = "/Milky Way/Globular Clusters"
+    }
 }


--- a/data/assets/scene/digitaluniverse/grids.asset
+++ b/data/assets/scene/digitaluniverse/grids.asset
@@ -10,7 +10,7 @@ local speck = asset.syncedResource({
 })

 local ecliptic = {
-    Name = "Ecliptic Sphere",
+    Identifier = "EclipticSphere",
    Parent = transforms.SolarSystemBarycenter.Name,
    Renderable = {
        Type = "RenderableSphericalGrid",
@@ -23,11 +23,14 @@ local ecliptic = {
                       -0.09647644,  0.8622859,  0.4971472   , 0.0,
                        0.0       ,  0.0      ,  0.0         , 1.0 }
    },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "Ecliptic Sphere",
+        Path = "/Other/Grids"
+    }
 }

 local eclipticLabels = {
-    Name = "Ecliptic Sphere Labels",
+    Identifier = "EclipticSphereLabels",
    Parent = transforms.SolarSystemBarycenter.Name,
    Renderable = {
        Type = "RenderableBillboardsCloud",
@@ -46,11 +49,14 @@ local eclipticLabels = {
            0.0,          0.0,        0.0,          1.0
        }
    },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "Ecliptic Sphere Labels",
+        Path = "/Other/Grids"
+    }
 }

 local equatorial = {
-    Name = "Equatorial Sphere",
+    Identifier = "EquatorialSphere",
    Parent = transforms.SolarSystemBarycenter.Name,
    Renderable = {
        Type = "RenderableSphericalGrid",
@@ -63,11 +69,14 @@ local equatorial = {
                       -0.483835  ,  0.7469823,  0.4559838, 0.0,
                        0.0       ,  0.0      ,  0.0      , 1.0 },
    },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "Equatorial Sphere",
+        Path = "/Other/Grids"
+    }
 }

 local equatorialLabels = {
-    Name = "Equatorial Sphere Labels",
+    Identifier = "EquatorialSphereLabels",
    Parent = transforms.SolarSystemBarycenter.Name,
    Renderable = {
        Type = "RenderableBillboardsCloud",
@@ -86,11 +95,14 @@ local equatorialLabels = {
            0.0,          0.0,        0.0,          1.0
        }
    },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "Equatorial Sphere Labels",
+        Path = "/Other/Grids"
+    }
 }

 local galactic = {
-    Name = "Galactic Sphere",
+    Identifier = "GalacticSphere",
    Parent = transforms.SolarSystemBarycenter.Name,
    Renderable = {
        Type = "RenderableSphericalGrid",
@@ -99,11 +111,14 @@ local galactic = {
        Radius = 9.46377307652E18;
        GridColor = { 0.0, 0.6, 0.6, 0.6}
    },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "Galactic Sphere",
+        Path = "/Other/Grids"
+    }
 }

 local galacticLabels = {
-    Name = "Galactic Sphere Labels",
+    Identifier = "GalacticSphereLabels",
    Parent = transforms.SolarSystemBarycenter.Name,
    Renderable = {
        Type = "RenderableBillboardsCloud",
@@ -116,11 +131,14 @@ local galacticLabels = {
        TextMinSize = 5.0,
        Unit = "pc"
    },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "Galactic Sphere Labels",
+        Path = "/Other/Grids"
+    }
 }

 local plane100kly = {
-    Name = "100kly Grid",
+    Identifier = "100klyGrid",
    Renderable = {
        Type = "RenderableDUMeshes",
        Enabled = false,
@@ -135,11 +153,14 @@ local plane100kly = {
        TextMinSize = 7.0,
        Unit = "Mpc"
    },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "100kly Grid",
+        Path = "/Other/Grids"
+    }
 }

 local plane1Mly = {
-    Name = "1Mly Grid",
+    Identifier = "1MlyGrid",
    Renderable = {
        Type = "RenderableDUMeshes",
        Enabled = false,
@@ -154,11 +175,14 @@ local plane1Mly = {
        TextMinSize = 7.0,
        Unit = "Mpc"
    },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "1Mly Grid",
+        Path = "/Other/Grids"
+    }
 }

 local plane10Mly = {
-    Name = "10Mly Grid",
+    Identifier = "10MlyGrid",
    Renderable = {
        Type = "RenderableDUMeshes",
        Enabled = false,
@@ -173,11 +197,14 @@ local plane10Mly = {
        TextMinSize = 7.0,
        Unit = "Mpc"
    },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "10Mly Grid",
+        Path = "/Other/Grids"
+    }
 }

 local plane100Mly = {
-    Name = "100Mly Grid",
+    Identifier = "100MlyGrid",
    Renderable = {
        Type = "RenderableDUMeshes",
        Enabled = false,
@@ -192,11 +219,14 @@ local plane100Mly = {
        TextMinSize = 7.0,
        Unit = "Mpc"
    },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "100Mly Grid",
+        Path = "/Other/Grids"
+    }
 }

 local plane20Gly = {
-    Name = "20Gly Grid",
+    Identifier = "20GlyGrid",
    Renderable = {
        Type = "RenderableDUMeshes",
        Enabled = false,
@@ -211,7 +241,10 @@ local plane20Gly = {
        TextMinSize = 7.0,
        Unit = "Mpc"
    },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "20Gly Grid",
+        Path = "/Other/Grids"
+    }
 }

 assetHelper.registerSceneGraphNodesAndExport(asset, {
--- a/data/assets/scene/digitaluniverse/groups.asset
+++ b/data/assets/scene/digitaluniverse/groups.asset
@@ -10,7 +10,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "Nearby Galaxy Groups",
+    Identifier = "NearbyGalaxyGroups",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -23,7 +23,10 @@ local object = {
        TextMinSize = 8.0,
        Unit = "Mpc"
    },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "Nearby Galaxy Groups",
+        Path = "/Universe/Galaxies"
+    }
 }


--- a/data/assets/scene/digitaluniverse/h2regions.asset
+++ b/data/assets/scene/digitaluniverse/h2regions.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "HII Regions",
+    Identifier = "HIIRegions",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -33,7 +33,10 @@ local object = {
        TextMinSize = 2.0,
        Unit = "pc"
    },
-    GuiPath = "/Milky Way/HII"
+    GUI = {
+        Name = "HII Regions",
+        Path = "/Milky Way/HII"
+    }
 }


--- a/data/assets/scene/digitaluniverse/kepler.asset
+++ b/data/assets/scene/digitaluniverse/kepler.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "Kepler Planetary Candidates",
+    Identifier = "KeplerPlanetaryCandidates",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -28,7 +28,10 @@ local object = {
        Texture = textures .. "/halo.png",
        Unit = "pc"
    },
-    GuiPath = "/Milky Way/Exoplanets"
+    GUI = {
+        Name = "Kepler Planetary Candidates",
+        Path = "/Milky Way/Exoplanets"
+    }
 }


--- a/data/assets/scene/digitaluniverse/localdwarfs.asset
+++ b/data/assets/scene/digitaluniverse/localdwarfs.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "Local Dwarf Galaxies",
+    Identifier = "LocalDwarfGalaxies",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -33,7 +33,10 @@ local object = {
        TextMinSize = 7.3,
        Unit = "Mpc"
    },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "Local Dwarf Galaxies",
+        Path = "/Universe/Galaxies"
+    }
 }


--- a/data/assets/scene/digitaluniverse/milkyway.asset
+++ b/data/assets/scene/digitaluniverse/milkyway.asset
@@ -24,21 +24,24 @@ local planeSpeck = asset.syncedResource({
 })

 local sphere = {
-    Name = "MilkyWay",
+    Identifier = "MilkyWay",
    Renderable = {
        Type = "RenderableSphere",
        Size = 9.2E20,
        Segments = 40,
-        Alpha = 0.4,
+        Opacity = 0.4,
        Texture = sphereTextures .. "/DarkUniverse_mellinger_4k.jpg",
        Orientation = "Inside/Outside",
        FadeOutThreshould = 0.25
    },
-    GuiPath = "/Milky Way/Milky Way"
+    GUI = {
+        Name = "Milky Way",
+        Path = "/Milky Way/Milky Way"
+    }
 }

 local plane = {
-    Name = "Milky Way Galaxy Image",
+    Identifier = "MilkyWayGalaxyImage",
    Parent = "Root",
    Renderable = {
        Type = "RenderablePlanesCloud",
@@ -56,7 +59,10 @@ local plane = {
        PlaneMinSize = 5.0,
        Unit = "pc"
    },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "Milky Way Galaxy Image",
+        Path = "/Universe/Galaxies"
+    }
 }


--- a/data/assets/scene/digitaluniverse/obassociations.asset
+++ b/data/assets/scene/digitaluniverse/obassociations.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "OB Associations",
+    Identifier = "OBAssociations",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -33,7 +33,10 @@ local object = {
        TextMinSize = 5.76,
        Unit = "pc"
    },
-    GuiPath = "/Milky Way/OB Associations"
+    GUI = {
+        Name = "OB Associations",
+        Path = "/Milky Way/OB Associations"
+    }
 }


--- a/data/assets/scene/digitaluniverse/openclusters.asset
+++ b/data/assets/scene/digitaluniverse/openclusters.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "Open Star Clusters",
+    Identifier = "OpenStarClusters",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -33,7 +33,10 @@ local object = {
        TextMinSize = 4.5,
        Unit = "pc"
    },
-    GuiPath = "/Milky Way/Open Clusters"
+    GUI = {
+        Name = "Open Star Clusters",
+        Path = "/Milky Way/Open Clusters"
+    }
 }


--- a/data/assets/scene/digitaluniverse/planetarynebulae.asset
+++ b/data/assets/scene/digitaluniverse/planetarynebulae.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "Planetary Nebulae",
+    Identifier = "PlanetaryNebulae",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -33,7 +33,10 @@ local object = {
        TextMinSize = 4.5,
        Unit = "pc"
    },
-    GuiPath = "/Milky Way/Planetary Nebulae"
+    GUI = {
+        Name = "Planetary Nebulae",
+        Path = "/Milky Way/Planetary Nebulae"
+    }
 }


--- a/data/assets/scene/digitaluniverse/pulsars.asset
+++ b/data/assets/scene/digitaluniverse/pulsars.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "Pulsars",
+    Identifier = "Pulsars",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -33,7 +33,9 @@ local object = {
        TextMinSize = 4.5,
        Unit = "pc"
    },
-    GuiPath = "/Milky Way/Pulsars"
+    GUI = {
+        Path = "/Milky Way/Pulsars"
+    }
 }


--- a/data/assets/scene/digitaluniverse/quasars.asset
+++ b/data/assets/scene/digitaluniverse/quasars.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "Quasars",
+    Identifier = "Quasars",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -32,7 +32,9 @@ local object = {
        BillboardMaxSize = 30.0,
        BillboardMinSize = 0.0,
    },
-    GuiPath = "/Universe/Quasars"
+    GUI = {
+        Path = "/Universe/Quasars"
+    }
 }


--- a/data/assets/scene/digitaluniverse/sdss.asset
+++ b/data/assets/scene/digitaluniverse/sdss.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "Sloan Digital Sky Survey",
+    Identifier = "SloanDigitalSkySurvey",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -38,7 +38,10 @@ local object = {
        TextMinSize = 10.0,
        TextMaxSize = 50.0
    },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "Sloan Digital Sky Survey",
+        Path = "/Universe/Galaxies"
+    }
 }


--- a/data/assets/scene/digitaluniverse/starlabels.asset
+++ b/data/assets/scene/digitaluniverse/starlabels.asset
@@ -10,7 +10,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "Stars Labels",
+    Identifier = "StarsLabels",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -24,7 +24,10 @@ local object = {
        TextMaxSize = 50.0,
        Unit = "pc"
    },
-    GuiPath = "/Milky Way/Stars"
+    GUI = {
+        Name = "Stars Labels",
+        Path = "/Milky Way/Stars"
+    }
 }


--- a/data/assets/scene/digitaluniverse/stars.asset
+++ b/data/assets/scene/digitaluniverse/stars.asset
@@ -24,14 +24,16 @@ local colorLUT = asset.syncedResource({
 })

 local object = {
-    Name = "Stars",
+    Identifier = "Stars",
    Renderable = {
        Type = "RenderableStars",
        File = speck .. "/stars.speck",
        Texture = textures .. "/halo.png",
        ColorMap = colorLUT .. "/colorbv.cmap"
    },
-    GuiPath = "/Milky Way/Stars"
+    GUI = {
+        Path = "/Milky Way/Stars"
+    }
 }


--- a/data/assets/scene/digitaluniverse/superclusters.asset
+++ b/data/assets/scene/digitaluniverse/superclusters.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "Galaxy Superclusters",
+    Identifier = "GalaxySuperclusters",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -32,7 +32,10 @@ local object = {
        TextMinSize = 8.0,
        Unit = "Mpc"
    },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "Galaxy Superclusters",
+        Path = "/Universe/Galaxies"
+    }
 }


--- a/data/assets/scene/digitaluniverse/supernovaremnants.asset
+++ b/data/assets/scene/digitaluniverse/supernovaremnants.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "Supernova Remnants",
+    Identifier = "SupernovaRemnants",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -33,7 +33,10 @@ local object = {
        TextMinSize = 8.0,
        Unit = "pc"
    },
-    GuiPath = "/Milky Way/Supernova Remnants"
+    GUI = {
+        Name = "Supernova Remnants",
+        Path = "/Milky Way/Supernova Remnants"
+    }
 }


--- a/data/assets/scene/digitaluniverse/tully.asset
+++ b/data/assets/scene/digitaluniverse/tully.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })

 local tullyPoints = {
-    Name = "Tully Galaxies",
+    Identifier = "TullyGalaxies",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -46,11 +46,14 @@ local tullyPoints = {
        BillboardMaxSize = 50.0,
        BillboardMinSize = 0.0,
    },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "Tully Galaxies",
+        Path = "/Universe/Galaxies"
+    }
 }

 local tullyImages = {
-    Name = "Tully Galaxies Images",
+    Identifier = "TullyGalaxiesImages",
    Renderable = {
        Type = "RenderablePlanesCloud",
        Enabled = false,
@@ -72,7 +75,10 @@ local tullyImages = {
        FadeInDistances = {0.05, 0.1},
        PlaneMinSize = 5.0
    },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "Tully Galaxies Images",
+        Path = "/Universe/Galaxies"
+    }
 }


--- a/data/assets/scene/digitaluniverse/voids.asset
+++ b/data/assets/scene/digitaluniverse/voids.asset
@@ -10,7 +10,7 @@ local speck = asset.syncedResource({
 })

 local object = {
-    Name = "Voids",
+    Identifier = "Voids",
    Renderable = {
        Type = "RenderableBillboardsCloud",
        Enabled = false,
@@ -22,7 +22,9 @@ local object = {
        TextMinSize = 8.0,
        Unit = "Mpc"
    },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Path = "/Universe/Galaxies"
+    }
 }


--- a/data/assets/scene/milkyway/milkyway/eso.asset
+++ b/data/assets/scene/milkyway/milkyway/eso.asset
@@ -10,17 +10,20 @@ local textures = asset.syncedResource({
 })

 local object = {
-    Name = "MilkyWay (ESO)",
+    Identifier = "MilkyWay-ESO",
    Renderable = {
        Type = "RenderableSphere",
        Size = 9.2E20,
        Segments = 40,
-        Alpha = 0.4,
+        Opacity = 0.4,
        Texture = textures .. "/eso0932a_blend.png",
        Orientation = "Inside/Outside",
        FadeOutThreshould = 0.01
    },
-    GuiPath = "/Milky Way/Milky Way"
+    GUI = {
+        Name = "Milky Way (ESO)",
+        Path = "/Milky Way/Milky Way"
+    }
 }


--- a/data/assets/scene/milkyway/stars/denver.asset
+++ b/data/assets/scene/milkyway/stars/denver.asset
@@ -24,14 +24,17 @@ local colorLUT = asset.syncedResource({
 })

 local object = {
-    Name = "Stars (Denver)",
+    Identifier = "Stars-Denver",
    Renderable = {
        Type = "RenderableStars",
        File = speck .. "/denver_stars.speck",
        Texture = textures .. "/halo.png",
        ColorMap = colorLUT .. "/denver_colorbv.cmap"
    },
-    GuiPath = "/Milky Way/Stars"
+    GUI = {
+        Name = "Stars (Denver)",
+        Path = "/Milky Way/Stars"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/dawn/ceres.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/ceres.asset
@@ -12,8 +12,8 @@ local textures = asset.syncedResource({
 })

 local Ceres = {
-    Name = "Ceres",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "Ceres",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
    Transform = {
        Rotation = {
            Type = "SpiceRotation",
@@ -50,7 +50,9 @@ local Ceres = {
            }
        }
    },
-    GuiPath = "/Solar System/Dwarf Planets/Ceres"
+    GUI = {
+        Path = "/Solar System/Dwarf Planets/Ceres"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/dawn/dawn.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/dawn.asset
@@ -617,8 +617,8 @@ local KernelFiles = {
 }

 local Dawn = {
-    Name = "Dawn",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "Dawn",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
    Transform = {
        Translation = {
            Type = "SpiceTranslation",
@@ -642,13 +642,15 @@ local Dawn = {
        },
        ColorTexture = textures .. "/gray.png"
    },
-    GuiPath = "/Solar System/Missions/Dawn"
+    GUI = {
+        Path = "/Solar System/Missions/Dawn"
+    }
 }

 -- Dawn Solar Array module 1
 local DawnSolarArray1 = {
-    Name = "DawnSolar1",
-    Parent = Dawn.Name,
+    Identifier = "DawnSolar1",
+    Parent = Dawn.Identifier,
    Transformation = {
        Rotation = {
            Type = "SpiceRotation",
@@ -665,13 +667,16 @@ local DawnSolarArray1 = {
        },
        ColorTexture = textures .. "/gray.png"
    },
-    GuiPath = "/Solar System/Missions/Dawn"
+    GUI = {
+        Name = "Dawn Solar 1",
+        Path = "/Solar System/Missions/Dawn"
+    }
 }

 -- Dawn Solar Array module 2
 local DawnSolarArray2 = {
-    Name = "DawnSolar2",
-    Parent = Dawn.Name,
+    Identifier = "DawnSolar2",
+    Parent = Dawn.Identifier,
    Transformation = {
        Rotation = {
            Type = "SpiceRotation",
@@ -688,12 +693,15 @@ local DawnSolarArray2 = {
        },
        ColorTexture = textures .. "/gray.png"
    },
-    GuiPath = "/Solar System/Missions/Dawn"
+    GUI = {
+        Name = "Dawn Solar 2",
+        Path = "/Solar System/Missions/Dawn"
+    }
 }

 local DawnTrail = {
-    Name = "DawnTrail",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "DawnTrail",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -711,13 +719,16 @@ local DawnTrail = {
        EnableFade = false,
        Rendering = "Lines+Points"
    },
-    GuiPath = "/Solar System/Missions/Dawn"
+    GUI = {
+        Name = "Dawn Trail",
+        Path = "/Solar System/Missions/Dawn"
+    }
 }

 -- DawnFov 1
 local DawnFramingCamera1 = {
-    Name = "Dawn_framing_camera_1",
-    Parent = Dawn.Name,
+    Identifier = "Dawn_framing_camera_1",
+    Parent = Dawn.Identifier,
    Renderable = {
        Type  = "RenderableFov",
        Body  = "DAWN",
@@ -730,12 +741,15 @@ local DawnFramingCamera1 = {
        },
        PotentialTargets = { "VESTA", "CERES" }
    },
-    GuiPath = "/Solar System/Missions/Dawn"
+    GUI = {
+        Name = "Dawn Framing Camera 1",
+        Path = "/Solar System/Missions/Dawn"
+    }
 }

 local DawnFramingCamera2 = {
-    Name = "Dawn_framing_camera_2",
-    Parent = Dawn.Name,
+    Identifier = "Dawn_framing_camera_2",
+    Parent = Dawn.Identifier,
    Renderable = {
        Type  = "RenderableFov",
        Body  = "DAWN",
@@ -748,7 +762,10 @@ local DawnFramingCamera2 = {
        },
        PotentialTargets = { "VESTA", "CERES" }
    },
-    GuiPath = "/Solar System/Missions/Dawn"
+    GUI = {
+        Name = "Dawn Framing Camera 2",
+        Path = "/Solar System/Missions/Dawn"
+    }
 }

 assetHelper.registerSceneGraphNodesAndExport(asset, {
--- a/data/assets/scene/solarsystem/missions/dawn/vesta.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/vesta.asset
@@ -25,8 +25,8 @@ local models = asset.syncedResource({
 })

 local Vesta = {
-    Name = "Vesta",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "Vesta",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
    Transform = {
        Translation = {
            Type = "SpiceTranslation",
@@ -108,12 +108,14 @@ local Vesta = {
            PotentialTargets = { "VESTA" }
        }
    },
-    GuiPath = "/Solar System/Asteroid Belt/Vesta"
+    GUI = {
+        Path = "/Solar System/Asteroid Belt/Vesta"
+    }
 }

 local VestaTrail = {
-    Name = "VestaTrail",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "VestaTrail",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailOrbit",
        Translation = {
@@ -127,7 +129,10 @@ local VestaTrail = {
        Period = 1325.0,
        Resolution = 3600 * 24
    },
-    GuiPath = "/Solar System/Asteroid Belt/Vesta"
+    GUI = {
+        Name = "Vesta Trail",
+        Path = "/Solar System/Asteroid Belt/Vesta"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/juno/juno.asset
+++ b/data/assets/scene/solarsystem/missions/juno/juno.asset
@@ -136,8 +136,8 @@ local RotationMatrix = {
 }

 local Juno = {
-    Name = "Juno",
-    Parent = transforms.JupiterBarycenter.Name,
+    Identifier = "Juno",
+    Parent = transforms.JupiterBarycenter.Identifier,
    Transform = {
        Translation = {
            Type = "SpiceTranslation",
@@ -161,12 +161,14 @@ local Juno = {
        ColorTexture =  textures .. "/gray.png",
        ModelTransform = RotationMatrix
    },
-    GuiName = "/Solar System/Missions/Juno"
+    GUI = {
+        Path = "/Solar System/Missions/Juno"
+    }
 }

 local JunoTrail = {
-    Name = "JunoTrail",
-    Parent = "JupiterBarycenter",
+    Identifier = "JunoTrail",
+    Parent = transforms.JupiterBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -180,7 +182,10 @@ local JunoTrail = {
        EndTime = "2016 DEC 13",
        SampleInterval = 2
    },
-    GuiName = "/Solar System/Missions/Juno"
+    GUI = {
+        Name = "Juno Trail",
+        Path = "/Solar System/Missions/Juno"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/newhorizons/charon.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/charon.asset
@@ -15,8 +15,8 @@ local textures = asset.syncedResource({
 local charonRadius = 6.035E5

 local Charon = {
-    Name = "Charon",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "Charon",
+    Parent = transforms.PlutoBarycenter.Identifier,
    Transform = {
        Translation = {
            Type = "SpiceTranslation",
@@ -66,12 +66,14 @@ local Charon = {
            }
        }
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }

 local CharonText = {
-    Name = "CharonText",
-    Parent = Charon.Name,
+    Identifier = "CharonText",
+    Parent = Charon.Identifier,
    Transform = {
        Translation = {
            Type = "StaticTranslation",
@@ -86,12 +88,15 @@ local CharonText = {
        Texture = textures .. "/Charon-Text.png",
        BlendMode = "Additive"
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Charon Text",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }

 local CharonShadow = {
-    Name = "CharonShadow",
-    Parent = Charon.Name,
+    Identifier = "CharonShadow",
+    Parent = Charon.Identifier,
    Renderable = {
        Type = "RenderableShadowCylinder",
        TerminatorType = "PENUMBRAL",
@@ -101,12 +106,15 @@ local CharonShadow = {
        BodyFrame = "IAU_CHARON",
        Aberration = "NONE"
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Charon Shadow",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }

 local CharonTrail = {
-    Name = "CharonTrail",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "CharonTrail",
+    Parent = transforms.PlutoBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailOrbit",
        Translation = {
@@ -118,7 +126,10 @@ local CharonTrail = {
        Period = 6.38725,
        Resolution = 1000
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Charon Trail",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/newhorizons/fov.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/fov.asset
@@ -9,8 +9,8 @@ local AliceOffset = {   -7.9, -1.7,  8.3  }
 local RexOffset   = {      0,    0,    0  }

 local Lorri = {
-    Name = "NH_LORRI",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_LORRI",
+    Parent = transforms.NewHorizonsPosition.Identifier,
    Renderable = {
        Type  = "RenderableFov",
        Body  = "NEW HORIZONS",
@@ -32,12 +32,15 @@ local Lorri = {
            Position = LorriOffset
        }
    },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "LORRI",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }

 local RalphLeisa = {
-    Name = "NH_RALPH_LEISA",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_RALPH_LEISA",
+    Parent = transforms.NewHorizonsPosition.Identifier,
    Renderable = {
        Type  = "RenderableFov",
        Body  = "NEW HORIZONS",
@@ -59,12 +62,15 @@ local RalphLeisa = {
            Position = RalphOffset
        }
    },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "RALPH LEISA",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }

 local RalphMvicPan1 = {
-    Name = "NH_RALPH_MVIC_PAN1",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_RALPH_MVIC_PAN1",
+    Parent = transforms.NewHorizonsPosition.Identifier,
    Renderable = {
        Type  = "RenderableFov",
        Body  = "NEW HORIZONS",
@@ -86,12 +92,15 @@ local RalphMvicPan1 = {
            Position = RalphOffset
        }
    },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "RALPH MVIC PAN 1",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }

 local RalphMvicPan2 = {
-    Name = "NH_RALPH_MVIC_PAN2",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_RALPH_MVIC_PAN2",
+    Parent = transforms.NewHorizonsPosition.Identifier,
    Renderable = {
        Type  = "RenderableFov",
        Body  = "NEW HORIZONS",
@@ -113,12 +122,15 @@ local RalphMvicPan2 = {
            Position = RalphOffset
        }
    },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "RALPH MVIC PAN 2",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }

 local RalphMvicRed = {
-    Name = "NH_RALPH_MVIC_RED",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_RALPH_MVIC_RED",
+    Parent = transforms.NewHorizonsPosition.Identifier,
    Renderable = {
        Type  = "RenderableFov",
        Body  = "NEW HORIZONS",
@@ -140,12 +152,15 @@ local RalphMvicRed = {
            Position = RalphOffset
        }
    },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "RALPH MVIC RED",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }

 local RalphMvicBlue = {
-    Name = "NH_RALPH_MVIC_BLUE",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_RALPH_MVIC_BLUE",
+    Parent = transforms.NewHorizonsPosition.Identifier,
    Renderable = {
        Type  = "RenderableFov",
        Body  = "NEW HORIZONS",
@@ -167,12 +182,15 @@ local RalphMvicBlue = {
            Position = RalphOffset
        }
    },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "RALPH MVIC BLUE",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }

 local RalphMvicFt = {
-    Name = "NH_RALPH_MVIC_FT",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_RALPH_MVIC_FT",
+    Parent = transforms.NewHorizonsPosition.Identifier,
    Renderable = {
        Type  = "RenderableFov",
        Body  = "NEW HORIZONS",
@@ -194,12 +212,15 @@ local RalphMvicFt = {
            Position = RalphOffset
        }
    },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "RALPH MVIC FT",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }

 local RalphMvicMethane = {
-    Name = "NH_RALPH_MVIC_METHANE",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_RALPH_MVIC_METHANE",
+    Parent = transforms.NewHorizonsPosition.Identifier,
    Renderable = {
        Type  = "RenderableFov",
        Body  = "NEW HORIZONS",
@@ -221,12 +242,15 @@ local RalphMvicMethane = {
            Position = RalphOffset
        }
    },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "RALPH MVIC METHANE",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }

 local RalphMvicNir = {
-    Name = "NH_RALPH_MVIC_NIR",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_RALPH_MVIC_NIR",
+    Parent = transforms.NewHorizonsPosition.Identifier,
    Renderable = {
        Type  = "RenderableFov",
        Body  = "NEW HORIZONS",
@@ -248,12 +272,15 @@ local RalphMvicNir = {
            Position = RalphOffset
        }
    },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "RALPH MVIC NIR",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }

 local AliceAirglow = {
-    Name = "NH_ALICE_AIRGLOW",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_ALICE_AIRGLOW",
+    Parent = transforms.NewHorizonsPosition.Identifier,
    Renderable = {
        Type  = "RenderableFov",
        Body  = "NEW HORIZONS",
@@ -276,12 +303,15 @@ local AliceAirglow = {
            Position = AliceOffset
        }
    },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "ALICE AIRGLOW",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }

 local AliceSoc = {
-    Name = "NH_ALICE_SOC",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_ALICE_SOC",
+    Parent = transforms.NewHorizonsPosition.Identifier,
    Renderable = {
        Type  = "RenderableFov",
        Body  = "NEW HORIZONS",
@@ -303,12 +333,15 @@ local AliceSoc = {
            Position = AliceOffset
        }
    },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "ALICE SOC",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }

 local Rex = {
-    Name = "NH_REX",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_REX",
+    Parent = transforms.NewHorizonsPosition.Identifier,
    Renderable = {
        Type  = "RenderableCrawlingLine",
        Source = "NH_REX",
@@ -333,7 +366,10 @@ local Rex = {
            Position = RexOffset
        }
    },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "REX",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/newhorizons/hydra.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/hydra.asset
@@ -12,8 +12,8 @@ local textures = asset.syncedResource({
 })

 local Hydra = {
-    Name = "Hydra",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "Hydra",
+    Parent = transforms.PlutoBarycenter.Identifier,
    Transform = {
        Translation = {
            Type = "SpiceTranslation",
@@ -34,12 +34,14 @@ local Hydra = {
        },
        ColorTexture = textures .. "/gray.jpg"
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }

 local HydraText = {
-    Name = "HydraText",
-    Parent = Hydra.Name,
+    Identifier = "HydraText",
+    Parent = Hydra.Identifier,
    Transform = {
        Translation = {
            Type = "StaticTranslation",
@@ -54,12 +56,15 @@ local HydraText = {
        Texture = textures .. "/Hydra-Text.png",
        BlendMode = "Additive"
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Hydra Text",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }

 local HydraTrail = {
-    Name = "HydraTrail",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "HydraTrail",
+    Parent = transforms.PlutoBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailOrbit",
        Translation = {
@@ -71,7 +76,10 @@ local HydraTrail = {
        Period = 38.20177,
        Resolution = 1000
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Hydra Trail",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/newhorizons/kerberos.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/kerberos.asset
@@ -12,8 +12,8 @@ local textures = asset.syncedResource({
 })

 local Kerberos = {
-    Name = "Kerberos",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "Kerberos",
+    Parent = transforms.PlutoBarycenter.Identifier,
    Transform = {
        Translation = {
            Type = "SpiceTranslation",
@@ -38,12 +38,14 @@ local Kerberos = {
        },
        ColorTexture = textures .. "/gray.jpg"
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }

 local KerberosText = {
-    Name = "KerberosText",
-    Parent = Kerberos.Name,
+    Identifier = "KerberosText",
+    Parent = Kerberos.Identifier,
    Transform = {
        Translation = {
            Type = "StaticTranslation",
@@ -57,12 +59,15 @@ local KerberosText = {
        Billboard = true,
        Texture = textures .. "/Kerberos-Text.png"
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Kerberos Text",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }

 local KerberosTrail = {
-    Name = "KerberosTrail",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "KerberosTrail",
+    Parent = transforms.PlutoBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailOrbit",
        Translation = {
@@ -74,7 +79,10 @@ local KerberosTrail = {
        Period = 32.16756,
        Resolution = 1000
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Kerberos Trail",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/newhorizons/label.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/label.asset
@@ -9,8 +9,8 @@ local textures = NewHorizonsModel.NewHorizonsTextures
 local models = NewHorizonsModel.NewHorizonsModels

 local Labels = {
-    Name = "Labels",
-    Parent = NewHorizonsModel.NewHorizons.Name,
+    Identifier = "Labels",
+    Parent = NewHorizonsModel.NewHorizons.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Body = "NEW HORIZONS",
@@ -20,7 +20,9 @@ local Labels = {
        }, 
        ColorTexture =  textures .. "/labels.png"
    },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Path = "/Solar System/Missions/New Horizons"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/newhorizons/model.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/model.asset
@@ -18,8 +18,8 @@ local models = asset.syncedResource({
 })

 local NewHorizons = {
-    Name = "NewHorizons",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NewHorizons",
+    Parent = transforms.NewHorizonsPosition.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Body = "NEW HORIZONS",
@@ -29,7 +29,10 @@ local NewHorizons = {
        }, 
        ColorTexture = textures .. "/NHTexture.jpg"
    },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "New Horizons",
+        Path = "/Solar System/Missions/New Horizons"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/newhorizons/nix.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/nix.asset
@@ -12,8 +12,8 @@ local textures = asset.syncedResource({
 })

 local Nix = {
-    Name = "Nix",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "Nix",
+    Parent = transforms.PlutoBarycenter.Identifier,
    Transform = {
        Translation = {
            Type = "SpiceTranslation",
@@ -24,6 +24,7 @@ local Nix = {
    },
    Renderable = {
        Type = "RenderablePlanet",
+        Body = "NIX",
        Geometry = {
            Type = "SimpleSphere",
            Radius = 0.45E5,
@@ -31,12 +32,14 @@ local Nix = {
        },
        ColorTexture = textures .. "/gray.jpg",
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }

 local NixText = {
-    Name = "NixText",
-    Parent = Nix.Name,
+    Identifier = "NixText",
+    Parent = Nix.Identifier,
    Renderable = {
        Type = "RenderablePlaneImageLocal",
        Size = 10^6.3,
@@ -45,12 +48,15 @@ local NixText = {
        Texture = textures .. "/Nix-Text.png",
        BlendMode = "Additive"
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Nix Text",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }

 local NixTrail = {
-    Name = "NixTrail",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "NixTrail",
+    Parent = transforms.PlutoBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailOrbit",
        Translation = {
@@ -62,7 +68,10 @@ local NixTrail = {
        Period = 24.85463,
        Resolution = 1000
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Nix Trail",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset
@@ -36,8 +36,8 @@ local images = asset.syncedResource({
 local plutoRadius = 1.173E6

 local Pluto = {
-    Name = "Pluto",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "Pluto",
+    Parent = transforms.PlutoBarycenter.Identifier,
    Transform = {
        Translation = {
            Type = "SpiceTranslation",
@@ -178,12 +178,14 @@ local Pluto = {
            }
        }
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }

 local PlutoBarycenterLabel = {
-    Name = "PlutoBarycenterLabel",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "PlutoBarycenterLabel",
+    Parent = transforms.PlutoBarycenter.Identifier,
    Renderable = {
        Type = "RenderablePlaneImageLocal",
        Billboard = true,
@@ -191,12 +193,15 @@ local PlutoBarycenterLabel = {
        Texture = encounterTextures .. "/barycenter.png",
        BlendMode = "Additive"
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Pluto Barycenter Label",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }

 local PlutoText = {
-    Name = "PlutoText",
-    Parent = Pluto.Name,
+    Identifier = "PlutoText",
+    Parent = Pluto.Identifier,
    Transform = {
        Translation = {
            Type = "StaticTranslation",
@@ -211,12 +216,15 @@ local PlutoText = {
        Texture = encounterTextures .. "/Pluto-Text.png",
        BlendMode = "Additive"
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Pluto Text",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }

 local PlutoShadow = {
-    Name = "PlutoShadow",
-    Parent = Pluto.Name,
+    Identifier = "PlutoShadow",
+    Parent = Pluto.Identifier,
    Renderable = {
        Type = "RenderableShadowCylinder",
        TerminatorType = "PENUMBRAL", 
@@ -226,12 +234,15 @@ local PlutoShadow = {
        BodyFrame = "IAU_PLUTO",
        Aberration = "NONE",
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Pluto Shadow",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }

 local PlutoTrailBarycentric = {
-    Name = "PlutoBarycentricTrail",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "PlutoBarycentricTrail",
+    Parent = transforms.PlutoBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailOrbit",
        Translation = {
@@ -243,12 +254,15 @@ local PlutoTrailBarycentric = {
        Period = 6.38723,
        Resolution = 1000
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Pluto Barycenteric Trail",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }

 local PlutoTrail = {
-    Name = "PlutoTrail",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "PlutoTrail",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailOrbit",
        Enabled = false,
@@ -263,7 +277,10 @@ local PlutoTrail = {
        Period = 160 * 365.242,
        Resolution = 1000
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Pluto Trail",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/newhorizons/styx.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/styx.asset
@@ -12,8 +12,8 @@ local textures = asset.syncedResource({
 })

 local Styx = {
-    Name = "Styx",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "Styx",
+    Parent = transforms.PlutoBarycenter.Identifier,
    Transform = {
        Translation = {
            Type = "SpiceTranslation",
@@ -33,12 +33,14 @@ local Styx = {
        },
        ColorTexture = textures .. "/gray.jpg"
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }

 local StyxText = {
-    Name = "StyxText",
-    Parent = Styx.Name,
+    Identifier = "StyxText",
+    Parent = Styx.Identifier,
    Transform = {
        Translation = {
            Type = "StaticTranslation",
@@ -53,12 +55,15 @@ local StyxText = {
        Texture = textures .. "/Styx-Text.png",
        BlendMode = "Additive"
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Styx Text",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }

 local StyxTrail = {
-    Name = "StyxTrail",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "StyxTrail",
+    Parent = transforms.PlutoBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailOrbit",
        Translation = {
@@ -70,7 +75,10 @@ local StyxTrail = {
        Period = 20.16155,
        Resolution = 1000
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Styx Trail",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/newhorizons/trail.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/trail.asset
@@ -4,8 +4,8 @@ local transforms = asset.require('./transforms')


 local TrailAtPluto = {
-    Name = "NewHorizonsTrailPluto",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "NewHorizonsTrailPluto",
+    Parent = transforms.PlutoBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -23,7 +23,10 @@ local TrailAtPluto = {
        EnableFade = false,
        Rendering = "Lines+Points"
    },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "New Horizons Trail Pluto",
+        Path = "/Solar System/Missions/New Horizons"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset
@@ -5,8 +5,8 @@ local kernels = asset.require('./kernels')


 local PlutoBarycenter = {
-    Name = "PlutoBarycenter",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "PlutoBarycenter",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Transform = {
        Translation = {
            Type = "SpiceTranslation",
@@ -15,12 +15,15 @@ local PlutoBarycenter = {
            Kernels = kernels.PlutoKernels
        },
    },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Pluto Barycenter",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }

 local NewHorizonsPosition = {
-    Name = "NewHorizonsPosition",
-    Parent = PlutoBarycenter.Name,
+    Identifier = "NewHorizonsPosition",
+    Parent = PlutoBarycenter.Identifier,
    Transform = {
        Translation = {
            Type = "SpiceTranslation",
@@ -34,7 +37,10 @@ local NewHorizonsPosition = {
            DestinationFrame = "GALACTIC"
        }
    },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "New Horizons Position",
+        Path = "/Solar System/Missions/New Horizons"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
@@ -22,10 +22,10 @@ local BENNU_BODY = "2101955"


 local Bennu = {
-    Name = "Bennu",
-    Parent = transforms.BennuBarycenter.Name,
-    Transform = 
-{        Rotation = {
+    Identifier = "Bennu",
+    Parent = transforms.BennuBarycenter.Identifier,
+    Transform = {
+        Rotation = {
            Type = "SpiceRotation",
            SourceFrame = "IAU_BENNU",
            DestinationFrame = "GALACTIC"
@@ -84,12 +84,14 @@ local Bennu = {
            }
        }
    },
-    GuiPath = "/Solar System/Asteroid"
+    GUI = {
+        Path = "/Solar System/Asteroid"
+    }
 }

 local BennuTrail = {
-    Name = "BennuTrail",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "BennuTrail",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -102,7 +104,10 @@ local BennuTrail = {
        EndTime = "2023 MAY 31 00:00:00.000",
        SampleInterval = 3600
    },
-    GuiPath = "/Solar System/Asteroid"
+    GUI = {
+        Name = "Bennu Trail",
+        Path = "/Solar System/Asteroid"
+    }

 }

--- a/data/assets/scene/solarsystem/missions/osirisrex/model.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/model.asset
@@ -184,8 +184,8 @@ for i = 0, #CaseDependentKernels do
 end

 local OsirisRex = {
-    Name = "OsirisRex",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "OsirisRex",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Transform = {
        Translation = {
            Type = "SpiceTranslation",
@@ -208,12 +208,15 @@ local OsirisRex = {
        },
        ColorTexture = textures .. "/osirisTex.png"
    },
-    GuiPath = "/Solar System/Missions/OSIRIS REx"
+    GUI = {
+        Name = "OSIRIS REx",
+        Path = "/Solar System/Missions/OSIRIS REx"
+    }
 }

 local PolyCam = {
-    Name = "ORX_OCAMS_POLYCAM",
-    Parent = OsirisRex.Name,
+    Identifier = "ORX_OCAMS_POLYCAM",
+    Parent = OsirisRex.Identifier,
    Transform = {
        Translation = {
            Type = "StaticTranslation",
@@ -234,12 +237,15 @@ local PolyCam = {
        }, 
        ColorTexture = textures .. "/osirisTex.png"
    },
-    GuiPath = "/Solar System/Missions/OSIRIS REx"
+    GUI = {
+        Name = "OCAMS POLYCAM",
+        Path = "/Solar System/Missions/OSIRIS REx/Instruments"
+    }
 }

 local Rexis = {
-    Name = "ORX_REXIS",
-    Parent = OsirisRex.Name,
+    Identifier = "ORX_REXIS",
+    Parent = OsirisRex.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Body = "OSIRIS-REX",
@@ -260,12 +266,15 @@ local Rexis = {
            DestinationFrame = "ORX_SPACECRAFT"
        },
    },
-    GuiPath = "/Solar System/Missions/OSIRIS REx"
+    GUI = {
+        Name = "REXIS",
+        Path = "/Solar System/Missions/OSIRIS REx/Instruments"
+    }
 }

 local PolyCamFov = {
-    Name = "POLYCAM FOV",
-    Parent = PolyCam.Name,
+    Identifier = "POLYCAM FOV",
+    Parent = PolyCam.Identifier,
    Renderable = {
        Type  = "RenderableFov",
        Body  = "OSIRIS-REX",
@@ -278,12 +287,15 @@ local PolyCamFov = {
        },
        PotentialTargets = { BENNU_BODY }
    },
-    GuiPath = "/Solar System/Missions/OSIRIS REx"
+    GUI = {
+        Name = "POLYCAM FOV",
+        Path = "/Solar System/Missions/OSIRIS REx/Instruments"
+    }
 }

 local RexisFov = {
-    Name = "REXIS FOV",
-    Parent = Rexis.Name,
+    Identifier = "REXIS FOV",
+    Parent = Rexis.Identifier,
    Renderable = {
        Type  = "RenderableFov",
        Body  = "OSIRIS-REX",
@@ -299,7 +311,10 @@ local RexisFov = {
            [BENNU_BODY] = "IAU_BENNU"
        }
    },
-    GuiPath = "/Solar System/Missions/OSIRIS REx"
+    GUI = {
+        Name = "REXIS FOV",
+        Path = "/Solar System/Missions/OSIRIS REx/Instruments"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/osirisrex/script_schedule.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/script_schedule.asset
@@ -14,5 +14,5 @@ end)


 asset.onDeinitialize(function ()
-	openspace.scriptScheduler.clear()
+    openspace.scriptScheduler.clear()
 end)
--- a/data/assets/scene/solarsystem/missions/osirisrex/trail.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/trail.asset
@@ -8,8 +8,8 @@ local earthTransforms = asset.require('scene/solarsystem/planets/earth/transform
 local BENNU_BODY = "2101955"

 local OsirisRexTrailEarth = {
-    Name = "OsirisRexTrailEarth",
-    Parent = earthTransforms.EarthIAU.Name,
+    Identifier = "OsirisRexTrailEarth",
+    Parent = earthTransforms.EarthIAU.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -23,12 +23,15 @@ local OsirisRexTrailEarth = {
        EndTime = "2016 SEP 9 00:05:00",
        SampleInterval = 60
    },
-    GuiPath = "/Solar System/Missions/OSIRIS REx"
+    GUI = {
+        Name = "OSIRIS REx Trail Earth",
+        Path = "/Solar System/Missions/OSIRIS REx"
+    }
 }

 local OsirisRexTrailSolarSystem = {
-    Name = "OsirisRexTrailSolarSystem",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "OsirisRexTrailSolarSystem",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -41,12 +44,15 @@ local OsirisRexTrailSolarSystem = {
        EndTime = "2023 SEP 24 12:00:00",
        SampleInterval = 3600
    },
-    GuiPath = "/Solar System/Missions/OSIRIS REx"
+    GUI = {
+        Name = "OSIRIS REx Trail Solar System",
+        Path = "/Solar System/Missions/OSIRIS REx"
+    }
 }

 local OsirisRexTrailBennu = {
-    Name = "OsirisRexTrailBennu",
-    Parent = transforms.BennuBarycenter.Name,
+    Identifier = "OsirisRexTrailBennu",
+    Parent = transforms.BennuBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -59,7 +65,10 @@ local OsirisRexTrailBennu = {
        EndTime = "2023 SEP 24 12:00:00",
        SampleInterval = 3600
    },
-    GuiPath = "/Solar System/Missions/OSIRIS REx"
+    GUI = {
+        Name = "OSIRIS REx Trail Bennu",
+        Path = "/Solar System/Missions/OSIRIS REx"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset
@@ -6,14 +6,18 @@ local transforms = asset.require('scene/solarsystem/sun/transforms')
 local BENNU_BODY = "2101955"

 local BennuBarycenter = {
-    Name = "BennuBarycenter",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "BennuBarycenter",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
    Transform = {
        Translation = {
            Type = "SpiceTranslation",
            Target = BENNU_BODY,
            Observer = "SUN"
        }
+    },
+    GUI = {
+        Name = "Bennu Barycenter",
+        Path = "/Solar System/Missions/OSIRIS REx"
    }
 }

--- a/data/assets/scene/solarsystem/missions/rosetta/67p.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/67p.asset
@@ -32,8 +32,8 @@ local imagesTorrent = asset.syncedResource({
 }) .. "/rosettaimages"

 local Barycenter = {
-    Name = "67PBarycenter",
-    Parent = transforms.SolarSystemBarycenter.Name, 
+    Identifier = "67PBarycenter",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
    Transform = {
        Translation = {
            Type = "SpiceTranslation",
@@ -41,12 +41,15 @@ local Barycenter = {
            Observer = "SUN"
        }
    },
-    GuiPath = "/Solar System/Comets/67P Churymov-Gerasimenko"
+    GUI = {
+        Name = "67P Barycenter",
+        Path = "/Solar System/Comets/67P Churymov-Gerasimenko"
+    }
 }

 local Comet67P = {
-    Name = "67P",
-    Parent = Barycenter.Name,
+    Identifier = "67P",
+    Parent = Barycenter.Identifier,
    Transform = {
        Rotation = {
            Type = "SpiceRotation",
@@ -108,12 +111,15 @@ local Comet67P = {

        BoundingSphereRadius = 5000.0
    },
-    GuiPath = "/Solar System/Comets/67P Churymov-Gerasimenko"
+    GUI = {
+        Name = "67P Churymov-Gerasimenko",
+        Path = "/Solar System/Comets/67P Churymov-Gerasimenko"
+    }
 }

 local Trail67P = {
-    Name = "67PTrail",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "67PTrail",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -126,7 +132,10 @@ local Trail67P = {
        EndTime = "2017 JAN 01 00:00:00.000",
        SampleInterval = 3600
    },
-    GuiPath = "/Solar System/Comets/67P Churymov-Gerasimenko"
+    GUI = {
+        Name = "67P Trail",
+        Path = "/Solar System/Comets/67P Churymov-Gerasimenko"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
@@ -82,8 +82,8 @@ local RotationMatrix = {
 }

 local Rosetta = {
-    Name = "Rosetta",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Rosetta",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Transform = {
        Translation = {
            Type = "SpiceTranslation",
@@ -97,12 +97,14 @@ local Rosetta = {
            DestinationFrame = "GALACTIC"
        }
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }

 local RosettaModel = {
-    Name = "RosettaModel",
-    Parent = Rosetta.Name,
+    Identifier = "RosettaModel",
+    Parent = Rosetta.Identifier,
    Transform = {
        Scale = {
            Type = "StaticScale",
@@ -110,12 +112,15 @@ local RosettaModel = {
            Scale = 0.01
        }
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }

 local RosettaBlackFoil = {
-    Name = "Rosetta_black_foil",
-    Parent = RosettaModel.Name,
+    Identifier = "Rosetta_black_foil",
+    Parent = RosettaModel.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Body = "ROSETTA",
@@ -126,12 +131,15 @@ local RosettaBlackFoil = {
        ColorTexture = textures .. "/foil_silver_ramp.png",
        ModelTransform = RotationMatrix
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model Part Black Foil",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }

 local RosettaBlackParts = {
-    Name = "Rosetta_black_parts",
-    Parent = RosettaModel.Name,
+    Identifier = "Rosetta_black_parts",
+    Parent = RosettaModel.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Body = "ROSETTA",
@@ -142,12 +150,15 @@ local RosettaBlackParts = {
        ColorTexture = textures .. "/foil_silver_ramp.png",
        ModelTransform = RotationMatrix
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model Part Black Parts",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }

 local RosettaDish = {
-    Name = "Rosetta_dish",
-    Parent = RosettaModel.Name,
+    Identifier = "Rosetta_dish",
+    Parent = RosettaModel.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Body = "ROSETTA",
@@ -158,12 +169,15 @@ local RosettaDish = {
        ColorTexture = textures .. "/dish_AO.png",
        ModelTransform = RotationMatrix
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model Part Dish",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }

 local RosettaParts = {
-    Name = "Rosetta_parts",
-    Parent = RosettaModel.Name,
+    Identifier = "Rosetta_parts",
+    Parent = RosettaModel.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Body = "ROSETTA",
@@ -174,12 +188,15 @@ local RosettaParts = {
        ColorTexture = textures .. "/parts2_AO.png",
        ModelTransform = RotationMatrix
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model Part Parts",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }

 local RosettaSilverFoil = {
-    Name = "Rosetta_silver_foil",
-    Parent = RosettaModel.Name,
+    Identifier = "Rosetta_silver_foil",
+    Parent = RosettaModel.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Body = "ROSETTA",
@@ -190,12 +207,15 @@ local RosettaSilverFoil = {
        ColorTexture = textures .. "/foil_silver_ramp.png",
        ModelTransform = RotationMatrix
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model Part Silver Foil",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }

 local RosettaVents = {
-    Name = "Rosetta_vents",
-    Parent = RosettaModel.Name,
+    Identifier = "Rosetta_vents",
+    Parent = RosettaModel.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Body = "ROSETTA",
@@ -206,12 +226,15 @@ local RosettaVents = {
        ColorTexture = textures .. "/tex_01.png",
        ModelTransform = RotationMatrix
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model Part Vents",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }

 local RosettaWingA = {
-    Name = "Rosetta_wing_a",
-    Parent = RosettaModel.Name,
+    Identifier = "Rosetta_wing_a",
+    Parent = RosettaModel.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Body = "ROSETTA",
@@ -222,12 +245,15 @@ local RosettaWingA = {
        ColorTexture = textures .. "/tex_01.png",
        ModelTransform = RotationMatrix
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model Part Wing A",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }

 local RosettaWingB = {
-    Name = "Rosetta_wing_b",
-    Parent = RosettaModel.Name,
+    Identifier = "Rosetta_wing_b",
+    Parent = RosettaModel.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Body = "ROSETTA",
@@ -238,12 +264,15 @@ local RosettaWingB = {
        ColorTexture = textures .. "/tex_01.png",
        ModelTransform = RotationMatrix
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model Part Wing B",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }

 local RosettaYellowFoil = {
-    Name = "Rosetta_yellow_foil",
-    Parent = RosettaModel.Name,
+    Identifier = "Rosetta_yellow_foil",
+    Parent = RosettaModel.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Body = "ROSETTA",
@@ -254,12 +283,15 @@ local RosettaYellowFoil = {
        ColorTexture = textures .. "/foil_gold_ramp.png",
        ModelTransform = RotationMatrix
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model Part Yellow Foil",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }

 local Philae = {
-    Name = "Philae",
-    Parent = transforms.Barycenter.Name,
+    Identifier = "Philae",
+    Parent = transforms.Barycenter.Identifier,
    -- This should need a transform, but currently the model is intrinsically
    -- translated
    Transform = {
@@ -280,12 +312,15 @@ local Philae = {
            Scale = 0.01
        }
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Philae Model",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }

 local PhilaeFoil = {
-    Name = "Philae_foil",
-    Parent = Philae.Name,
+    Identifier = "Philae_foil",
+    Parent = Philae.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Body = "ROSETTA",
@@ -296,12 +331,15 @@ local PhilaeFoil = {
        ColorTexture = textures .. "/foil_silver_ramp.png",
        ModelTransform = RotationMatrix
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Philae Model Part Foil",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }

 local PhilaeLids = {
-    Name = "Philae_lids",
-    Parent = Philae.Name,
+    Identifier = "Philae_lids",
+    Parent = Philae.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Body = "ROSETTA",
@@ -312,12 +350,15 @@ local PhilaeLids = {
        ColorTexture = textures .. "/parts2_AO.png",
        ModelTransform = RotationMatrix
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Philae Model Part Lids",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }

 local PhilaeParts = {
-    Name = "Philae_parts",
-    Parent = Philae.Name,
+    Identifier = "Philae_parts",
+    Parent = Philae.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Body = "ROSETTA",
@@ -328,12 +369,15 @@ local PhilaeParts = {
        ColorTexture = textures .. "/foil_silver_ramp.png",
        ModelTransform = RotationMatrix
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Philae Model Part Parts",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }

 local PhilaeSolarPanels = {
-    Name = "Philae_solarp",
-    Parent = Philae.Name,
+    Identifier = "Philae_solarp",
+    Parent = Philae.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Body = "ROSETTA",
@@ -344,18 +388,23 @@ local PhilaeSolarPanels = {
        ColorTexture = textures .. "/tex_01.png",
        ModelTransform = RotationMatrix
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Philae Model Parts Solar Panels",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }

 local NavCam = {
-    Name = "NAVCAM",
-    Parent = Rosetta.Name,
-    GuiPath = "/Solar System/Missions/Rosetta"
+    Identifier = "NAVCAM",
+    Parent = Rosetta.Identifier,
+    GUI = {
+        Path = "/Solar System/Missions/Rosetta/Instruments"
+    }
 }

 local NavCamFov = {
-    Name = "NAVCAM FOV",
-    Parent = NavCam.Name,
+    Identifier = "NAVCAM_FOV",
+    Parent = NavCam.Identifier,
    Renderable = {
        Type  = "RenderableFov",
        Body  = "ROSETTA",
@@ -371,12 +420,15 @@ local NavCamFov = {
            ["CHURYUMOV-GERASIMENKO"] = "67P/C-G_CK"
        }
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "NAVCAM FOV",
+        Path = "/Solar System/Missions/Rosetta/Instruments"
+    }
 }

 local ImagePlane = {
-    Name = "ImagePlaneRosetta",
-    Parent = transforms.Comet67P.Name,
+    Identifier = "ImagePlaneRosetta",
+    Parent = transforms.Comet67P.Identifier,
    Renderable = {
        Type = "RenderablePlaneProjection",
        Frame = "67P/C-G_CK",
@@ -386,12 +438,15 @@ local ImagePlane = {
        Moving = false,
        Texture = textures .. "/defaultProj.png"
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Image Plane",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }

 local RosettaCometTrail = {
-    Name = "RosettaCometTrail",
-    Parent = transforms.Barycenter.Name,
+    Identifier = "RosettaCometTrail",
+    Parent = transforms.Barycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -404,12 +459,15 @@ local RosettaCometTrail = {
        EndTime = "2016 SEP 30 12:00:00",
        SampleInterval = 3600
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Comet Trail",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }

 local PhilaeTrail = {
-    Name = "PhilaeTrail",
-    Parent = transforms.Barycenter.Name,
+    Identifier = "PhilaeTrail",
+    Parent = transforms.Barycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -422,7 +480,10 @@ local PhilaeTrail = {
        EndTime = "2014 NOV 12 17:00:00",
        SampleInterval = 2
    },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Philae Trail",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
@@ -35,8 +35,8 @@ local RotationMatrix = {
 }

 local Voyager1 = {
-    Name = "Voyager 1",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_1",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Transform = {
        Translation = {
            Type = "SpiceTranslation",
@@ -50,12 +50,15 @@ local Voyager1 = {
            DestinationFrame = "GALACTIC"
        }
    },
-    GuiPath = "/Solar System/Missions/Voyager 1"
+    GUI = {
+        Name = "Voyager 1",
+        Path = "/Solar System/Missions/Voyager 1"
+    }
 }

 local Voyager1Main = {
-    Name = "Voyager 1 Main",
-    Parent = Voyager1.Name,
+    Identifier = "Voyager_1_Main",
+    Parent = Voyager1.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Geometry = {
@@ -65,12 +68,15 @@ local Voyager1Main = {
        ColorTexture = models .. "/voyager-main.jpg",
        ModelTransform = RotationMatrix
    },
-    GuiPath = "/Solar System/Missions/Voyager 1"
+    GUI = {
+        Name = "Voyager 1 Main",
+        Path = "/Solar System/Missions/Voyager 1"
+    }
 }

 local Voyager1Antenna = {
-    Name = "Voyager 1 Antanna",
-    Parent = Voyager1.Name,
+    Identifier = "Voyager_1_Antanna",
+    Parent = Voyager1.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Geometry = {
@@ -80,15 +86,18 @@ local Voyager1Antenna = {
        ColorTexture = models .. "/voyager-antenna.png",
        ModelTransform = RotationMatrix
    },
-    GuiPath = "/Solar System/Missions/Voyager 1"
+    GUI = {
+        Name = "Voyager 1 Antanna",
+        Path = "/Solar System/Missions/Voyager 1"
+    }
 }

    -- The trails are organized as follows.  The cruise phases can be resolved in relatively
    -- low resolution since they are just straight lines
    -- The encounter phases should be much higher resolution or otherwise artifacts would appear
 local VoyagerTrailCruiseEarthJupiter = {
-    Name = "Voyager 1 Trail Cruise Earth-Jupiter",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_1_Trail_Cruise_Earth_Jupiter",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -102,12 +111,15 @@ local VoyagerTrailCruiseEarthJupiter = {
        EndTime = "1979 MAR 04",
        SampleInterval = 545 * 2  -- 545 is the number of days between the Start and End time
    },
-    GuiPath = "/Solar System/Missions/Voyager 1"
+    GUI = {
+        Name = "Voyager 1 Trail Cruise Earth-Jupiter",
+        Path = "/Solar System/Missions/Voyager 1"
+    }
 }

 local VoyagerTrailEncounterJupiter = {
-    Name = "Voyager 1 Trail Encounter Jupiter",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_1_Trail_Encounter_Jupiter",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -122,12 +134,15 @@ local VoyagerTrailEncounterJupiter = {
        EndTime = "1979 MAR 09",
        SampleInterval = 100
    },
-    GuiPath = "/Solar System/Missions/Voyager 1"
+    GUI = {
+        Name = "Voyager 1 Trail Encounter Jupiter",
+        Path = "/Solar System/Missions/Voyager 1"
+    }
 }

 local VoyagerTrailCruiseJupiterSaturn = {
-    Name = "Voyager 1 Trail Cruise Jupiter-Saturn",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_1_Trail_Cruise_Jupiter_Saturn",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -142,12 +157,15 @@ local VoyagerTrailCruiseJupiterSaturn = {
        EndTime = "1980 NOV 11",
        SampleInterval = 618 * 2  -- 618 is the number of days between the Start and End time
    },
-    GuiPath = "/Solar System/Missions/Voyager 1"
+    GUI = {
+        Name = "Voyager 1 Trail Cruise Jupiter-Saturn",
+        Path = "/Solar System/Missions/Voyager 1"
+    }
 }

 local VoyagerTrailEncounterSaturn = {
-    Name = "Voyager 1 Trail Encounter Saturn",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_1_Trail_Encounter_Saturn",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -162,12 +180,15 @@ local VoyagerTrailEncounterSaturn = {
        EndTime = "1980 NOV 16",
        SampleInterval = 100
    },
-    GuiPath = "/Solar System/Missions/Voyager 1"
+    GUI = {
+        Name = "Voyager 1 Trail Encounter Saturn",
+        Path = "/Solar System/Missions/Voyager 1"
+    }
 }

 local VoyagerTrailCruiseSaturnInf = {
-    Name = "Voyager 1 Trail Cruise Saturn-Inf",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_1_Trail_Cruise_Saturn_Inf",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -182,7 +203,10 @@ local VoyagerTrailCruiseSaturnInf = {
        EndTime = "2021 JAN 01",
        SampleInterval = 14656 * 2  -- 14656 is the number of days between the Start and End time
    },
-    GuiPath = "/Solar System/Missions/Voyager 1"
+    GUI = {
+        Name = "Voyager 1 Trail Cruise Saturn-Inf",
+        Path = "/Solar System/Missions/Voyager 1"
+    }
 }


--- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
@@ -37,8 +37,8 @@ local RotationMatrix = {
 }

 local Voyager2 = {
-    Name = "Voyager 2",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Transform = {
        Translation = {
            Type = "SpiceTranslation",
@@ -52,12 +52,15 @@ local Voyager2 = {
            DestinationFrame = "GALACTIC"
        }
    },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }

 local Voyager2Main = {
-    Name = "Voyager 2 Main",
-    Parent = Voyager2.Name,
+    Identifier = "Voyager_2_Main",
+    Parent = Voyager2.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Geometry = {
@@ -67,12 +70,15 @@ local Voyager2Main = {
        ColorTexture = models .. "/voyager-main.jpg",
        ModelTransform = RotationMatrix
    },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Main",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }

 local Voyager2Antenna = {
-    Name = "Voyager 2 Antanna",
-    Parent = Voyager2.Name,
+    Identifier = "Voyager_2_Antanna",
+    Parent = Voyager2.Identifier,
    Renderable = {
        Type = "RenderableModel",
        Geometry = {
@@ -82,15 +88,18 @@ local Voyager2Antenna = {
        ColorTexture = models .. "/voyager-antenna.png",
        ModelTransform = RotationMatrix
    },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Antanna",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }

    -- The trails are organized as follows.  The cruise phases can be resolved in relatively
    -- low resolution since they are just straight lines
    -- The encounter phases should be much higher resolution or otherwise artifacts would appear
 local VoyagerTrailCruiseEarthJupiter = {
-    Name = "Voyager 2 Trail Cruise Earth-Jupiter",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2_Trail_Cruise_Earth_Jupiter",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -104,12 +113,15 @@ local VoyagerTrailCruiseEarthJupiter = {
        EndTime = "1979 JUL 06",
        SampleInterval = 669 * 2  -- 669 is the number of days between the Start and End time
    },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Trail Cruise Earth-Jupiter",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }

 local VoyagerTrailEncounterJupiter = {
-    Name = "Voyager 2 Trail Encounter Jupiter",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2_Trail_Encounter_Jupiter",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -124,12 +136,15 @@ local VoyagerTrailEncounterJupiter = {
        EndTime = "1979 JUL 15",
        SampleInterval = 100
    },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Trail Encounter Jupiter",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }

 local VoyagerTrailCruiseJupiterSaturn = {
-    Name = "Voyager 2 Trail Cruise Jupiter-Saturn",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2_Trail_Cruise_Jupiter_Saturn",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -144,12 +159,15 @@ local VoyagerTrailCruiseJupiterSaturn = {
        EndTime = "1981 AUG 23",
        SampleInterval = 770 * 2  -- 770 is the number of days between the Start and End time
    },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Trail Cruise Jupiter-Saturn",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }

 local VoyagerTrailEncounterSaturn = {
-    Name = "Voyager 2 Trail Encounter Saturn",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2_Trail_Encounter_Saturn",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -164,12 +182,15 @@ local VoyagerTrailEncounterSaturn = {
        EndTime = "1981 AUG 30",
        SampleInterval = 100
    },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Trail Encounter Saturn",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }

 local VoyagerTrailSaturnUranus = {
-    Name = "Voyager 2 Trail Cruise Saturn-Uranus",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2_Trail_Cruise_Saturn_Uranus",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -184,12 +205,15 @@ local VoyagerTrailSaturnUranus = {
        EndTime = "1986 JAN 22",
        SampleInterval = 1971  * 2  -- 1971 is the number of days between the Start and End time
    },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Trail Cruise Saturn-Uranus",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }

 local VoyagerTrailEncounterUranus = {
-    Name = "Voyager 2 Trail Encounter Uranus",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2_Trail_Encounter_Uranus",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -204,12 +228,15 @@ local VoyagerTrailEncounterUranus = {
        EndTime = "1986 JAN 27",
        SampleInterval = 100
    },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Trail Encounter Uranus",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }

 local VoyagerTrailCruiseUranusNeptune = {
-    Name = "Voyager 2 Trail Cruise Uranus-Neptune",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2_Trail_Cruise_Uranus_Neptune",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -224,12 +251,15 @@ local VoyagerTrailCruiseUranusNeptune = {
        EndTime = "1989 AUG 24",
        SampleInterval = 1305  * 2  -- 1305 is the number of days between the Start and End time
    },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Trail Cruise Uranus-Neptune",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }

 local VoyagerTrailEncounterNeptune = {
-    Name = "Voyager 2 Trail Encounter Neptune",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2_Trail_Encounter_Neptune",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -244,12 +274,15 @@ local VoyagerTrailEncounterNeptune = {
        EndTime = "1989 AUG 26",
        SampleInterval = 100
    },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Trail Encounter Neptune",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }

 local VoyagerTrailCruiseNeptuneInf = {
-    Name = "Voyager 2 Trail Cruise Neptune-Inf",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2_Trail_Cruise_Neptune_Inf",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailTrajectory",
        Translation = {
@@ -264,7 +297,10 @@ local VoyagerTrailCruiseNeptuneInf = {
        EndTime = "2021 JAN 01",
        SampleInterval = 11451 * 2  -- 11451 is the number of days between the Start and End time
    },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Trail Cruise Neptune-Inf",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }


--- a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset
+++ b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset
@@ -6,28 +6,28 @@ local assetHelper = asset.require('util/asset_helper')
 -- local earthEllipsoid = { 6378137.0, 6378137.0, 6356752.314245 }
 local earthEllipsoid = { 6378137.0, 6378137.0, 6378137.0 }
 local Atmosphere = {
-    Name = "EarthAtmosphere",
-    Parent = transforms.Earth.Name,
+    Identifier = "EarthAtmosphere",
+    Parent = transforms.Earth.Identifier,
    Renderable = {
        Type = "RenderableAtmosphere",
        Atmosphere = {
-          -- Atmosphere radius in Km
-          AtmosphereRadius = 6447.0,
-          PlanetRadius    = 6377.0,
-          PlanetAverageGroundReflectance = 0.1,
-          GroundRadianceEmittion = 0.6,
-          Rayleigh = {
-            Coefficients = {
-              -- Wavelengths are given in 10^-9m
-              Wavelengths = { 680, 550, 440 },
-              -- Reflection coefficients are given in km^-1
-              Scattering = { 5.8E-3, 13.5E-3, 33.1E-3 },
-              -- In Rayleigh scattering, the coefficients of absorption and scattering are the same.
+            -- Atmosphere radius in Km
+            AtmosphereRadius = 6447.0,
+            PlanetRadius    = 6377.0,
+            PlanetAverageGroundReflectance = 0.1,
+            GroundRadianceEmittion = 0.6,
+            Rayleigh = {
+              Coefficients = {
+                -- Wavelengths are given in 10^-9m
+                Wavelengths = { 680, 550, 440 },
+                -- Reflection coefficients are given in km^-1
+                Scattering = { 5.8E-3, 13.5E-3, 33.1E-3 },
+                -- In Rayleigh scattering, the coefficients of absorption and scattering are the same.
+              },
+              -- Thichkness of atmosphere if its density were uniform, in Km
+              H_R = 8.0
            },
-            -- Thichkness of atmosphere if its density were uniform, in Km
-            H_R = 8.0
-          },
-          --[[
+            --[[
              Ozone = {
              Coefficients = {
                -- Extinction coefficients 
@@ -93,7 +93,10 @@ local Atmosphere = {
            --Caster2 = { Name = "Independency Day Ship", Radius = 0.0, }
         }
    },
-    GuiPath = "/Solar System/Planets/Earth"
+    GUI = {
+        Name = "Earth Atmosphere",
+        Path = "/Solar System/Planets/Earth"
+    }
 }


--- a/data/assets/scene/solarsystem/planets/earth/earth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/earth.asset
@@ -10,21 +10,24 @@ local earthEllipsoid = { 6378137.0, 6378137.0, 6378137.0 }
 local mapServiceConfigsPath = asset.localResource("map_service_configs")

 local Earth = {
-    Name = "Earth",
-    Parent = transforms.EarthIAU.Name,
+    Identifier = "Earth",
+    Parent = transforms.EarthIAU.Identifier,
    Renderable = {
        Type = "RenderableGlobe",
        Radii = earthEllipsoid,
        SegmentsPerPatch = 64,
+        PerformShading = false,
        Layers = {
            ColorLayers = {
                {
+                    Identifier = "ESRI_VIIRS_Combo",
                    Name = "ESRI VIIRS Combo",
                    Type = "ByLevelTileLayer",
                    LevelTileProviders = {
                        {
                            MaxLevel = 4,
                            TileProvider = {
+                                Identifier = "Temporal_VIIRS_SNPP",
                                Name = "Temporal VIIRS SNPP",
                                Type = "TemporalTileLayer",
                                FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
@@ -41,6 +44,7 @@ local Earth = {
                        {
                            MaxLevel = 22,
                            TileProvider = {
+                                Identifier = "ESRI_World_Imagery",
                                Name = "ESRI World Imagery",
                                FilePath = mapServiceConfigsPath .. "/ESRI/World_Imagery.wms",
                                PadTiles = false
@@ -50,20 +54,24 @@ local Earth = {
                    Enabled = true,
                    PadTiles = false,
                    Fallback = {
+                        Identifier = "Blue_Marble",
                        Name = "Blue Marble",
                        FilePath = texturesPath .. "/earth_bluemarble.jpg",
                        Enabled = true
                    }
                },
                {
+                    Identifier = "ESRI_World_Imagery",
                    Name = "ESRI World Imagery",
                    FilePath = mapServiceConfigsPath .. "/ESRI/World_Imagery.wms"
                },
                {
+                    Identifier = "ESRI_Imagery_World_2D",
                    Name = "ESRI Imagery World 2D",
                    FilePath = mapServiceConfigsPath .. "/ESRI/ESRI_Imagery_World_2D.wms"
                },
                {
+                    Identifier = "VIIRS_SNPP_Temporal",
                    Name = "VIIRS SNPP (Temporal)",
                    Type = "TemporalTileLayer",
                    FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
@@ -76,6 +84,7 @@ local Earth = {
                    )
                },
                {
+                    Identifier = "Aqua_Modis_Temporal",
                    Name = "Aqua Modis (Temporal)",
                    Type = "TemporalTileLayer",
                    FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
@@ -88,6 +97,7 @@ local Earth = {
                    )
                },
                {
+                    Identifier = "Terra_Modis_Temporal",
                    Name = "Terra Modis (Temporal)",
                    Type = "TemporalTileLayer",
                    FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
@@ -100,11 +110,12 @@ local Earth = {
                    )
                },
                {
-                    Name = "BMNG",
+                    Identifier = "BMNG",
                    FilePath = mapServiceConfigsPath .. "/Utah/Bmng.wms"
                },
                {
-                    Name = "AMSR2_GCOM_W1_Sea_Ice_Concentration (Temporal)",
+                    Identifier = "AMSR2_GCOM_W1_Sea_Ice_Concentration_Temporal",
+                    Name = "AMSR2 GCOM W1 Sea Ice Concentration (Temporal)",
                    Type = "TemporalTileLayer",
                    FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
                        "AMSR2_Sea_Ice_Concentration_12km",
@@ -116,7 +127,8 @@ local Earth = {
                    )
                },
                {
-                    Name = "MODIS_Terra_Chlorophyll_A (Temporal)",
+                    Identifier = "MODIS_Terra_Chlorophyll_A_Temporal",
+                    Name = "MODIS Terra Chlorophyll A (Temporal)",
                    Type = "TemporalTileLayer",
                    FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
                        "MODIS_Terra_Chlorophyll_A",
@@ -128,7 +140,8 @@ local Earth = {
                    )
                },
                {
-                    Name = "GHRSST_L4_G1SST_Sea_Surface_Temperature (Temporal)",
+                    Identifier = "GHRSST_L4_G1SST_Sea_Surface_Temperature_Temporal",
+                    Name = "GHRSST L4 G1SST Sea Surface Temperature (Temporal)",
                    Type = "TemporalTileLayer",
                    FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
                        "GHRSST_L4_G1SST_Sea_Surface_Temperature",
@@ -142,26 +155,19 @@ local Earth = {
            },
            NightLayers = {
                {
+                    Identifier = "Earth_at_Night_2012",
                    Name = "Earth at Night 2012",
                    FilePath = mapServiceConfigsPath .. "/GIBS/night/VIIRS_CityLights_2012.wms",
                    Enabled = true,
-                    Settings = {
-                        Opacity = 1.0,
-                        Gamma = 1.5,
-                        Multiplier = 15.0
-                    },
                    Fallback = {
+                        Identifier = "Earth_Night",
                        Name = "Earth Night",
                        FilePath = texturesPath .. "/earth_night.jpg",
                        Enabled = true,
-                        Settings = {
-                            Opacity = 1.0,
-                            Gamma = 1.5,
-                            Multiplier = 15.0
-                        },
                    }
                },
                {
+                    Identifier = "Earth_at_Night_Temporal",
                    Name = "Earth at Night (Temporal)",
                    Type = "TemporalTileLayer",
                    FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
@@ -176,33 +182,38 @@ local Earth = {
            },
            WaterMasks = {
                {
-                    Name = "MODIS_Water_Mask",
+                    Identifier = "MODIS_Water_Mask",
+                    Name = "MODIS Water Mask",
                    FilePath = mapServiceConfigsPath .. "/GIBS/water/MODIS_Water_Mask.wms",
                    Enabled = true
                },
                {
-                    Name = "GEBCO",
+                    Identifier = "GEBCO",
                    FilePath = mapServiceConfigsPath .. "/Utah/Gebco.wms"
                }
            },
            Overlays = {
                {
-                    Name = "Coastlines",
+                    Identifier = "Coastlines",
                    FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Coastlines.wms"
                },
                {
-                    Name = "Reference_Features",
+                    Identifier = "Reference_Features",
+                    Name = "Reference Features",
                    FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Features.wms"
                },
                {
-                    Name = "Reference_Labels",
+                    Identifier = "Reference_Labels",
+                    Name = "Reference Labels",
                    FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Labels.wms"
                },
                {
+                    Identifier = "Tile_Indices",
                    Name = "Tile Indices",
                    Type = "TileIndexTileLayer"
                },
                {
+                    Identifier = "Size_Reference",
                    Name = "Size Reference",
                    Type = "SizeReferenceTileLayer",
                    Radii = earthEllipsoid
@@ -210,6 +221,7 @@ local Earth = {
            },
            HeightLayers = {
                {
+                    Identifier = "Terrain_tileset",
                    Name = "Terrain tileset",
                    FilePath = mapServiceConfigsPath .. "/ESRI/Terrain.wms",
                    Enabled = true,
@@ -224,7 +236,9 @@ local Earth = {
        }
    },
    Tag = { "planet_solarSystem", "planet_terrestrial" },
-    GuiPath = "/Solar System/Planets/Earth"
+    GUI = {
+        Path = "/Solar System/Planets/Earth"
+    }
 }


--- a/data/assets/scene/solarsystem/planets/earth/markers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/markers.asset
@@ -5,8 +5,8 @@ local texturesPath = asset.require('./earth_textures').TexturesPath


 local EarthMarker = {
-    Name = "EarthMarker",
-    Parent = transforms.EarthIAU.Name,
+    Identifier = "EarthMarker",
+    Parent = transforms.EarthIAU.Identifier,
    Renderable = {
        Type = "RenderablePlaneImageLocal",
        Enabled = false,
@@ -16,7 +16,10 @@ local EarthMarker = {
        Texture = texturesPath .. "/marker.png",
        BlendMode = "Additive"
    },
-    GuiPath = "/Solar System/Planets/Earth"
+    GUI = {
+        Name = "Earth Marker",
+        Path = "/Solar System/Planets/Earth"
+    }
 }


--- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
@@ -10,8 +10,8 @@ asset.request('./trail')
 local mapServiceConfigs = asset.localResource("map_service_configs")

 local Moon = {
-    Name = "Moon",
-    Parent = transforms.EarthBarycenter.Name,
+    Identifier = "Moon",
+    Parent = transforms.EarthBarycenter.Identifier,
    Transform = {
        Translation = {
            Type = "SpiceTranslation",
@@ -32,28 +32,31 @@ local Moon = {
            ColorLayers = {
                -- Utah based servers
                {
-                    Name = "ClemUvvis",
+                    Identifier = "ClemUvvis",
+                    Name = "Clem Uvvis",
                    FilePath = mapServiceConfigs .. "/Utah/ClemUvvis.wms"
                },
                {
-                    Name = "Kaguya",
+                    Identifier = "Kaguya",
                    FilePath = mapServiceConfigs .. "/Utah/Kaguya.wms"
                },
                {
+                    Identifier = "WAC_Utah",
                    Name = "WAC Utah",
                    FilePath = mapServiceConfigs .. "/Utah/Wac.wms",
                    Enabled = true
                },
                -- LMMP based servers
                {
-                    Name = "OnMoon",
+                    Identifier = "OnMoon",
                    FilePath = mapServiceConfigs .. "/OnMoonColor.wms"
                }
            },
            HeightLayers = {
                -- Utah based servers
                {
-                    Name = "LolaDem",
+                    Identifier = "LolaDem",
+                    Name = "WAC [Utah]",
                    FilePath = mapServiceConfigs .. "/Utah/LolaDem.wms",
                    Enabled = true,
                    TilePixelSize = 64,
@@ -72,7 +75,9 @@ local Moon = {
            }
        }
    },
-    GuiPath = "/Solar System/Planets/Earth/Moon"
+    GUI = {
+        Path = "/Solar System/Planets/Earth/Moon"
+    }
 }


--- a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset
@@ -5,8 +5,8 @@ asset.require('spice/base')


 local MoonTrail = {
-    Name = "MoonTrail",
-    Parent = transforms.EarthBarycenter.Name,
+    Identifier = "MoonTrail",
+    Parent = transforms.EarthBarycenter.Identifier,
    Renderable = {
        Type = "RenderableTrailOrbit",
        Translation = {
@@ -18,7 +18,10 @@ local MoonTrail = {
        Period =  27,
        Resolution = 1000
    },
-    GuiPath = "/Solar System/Planets/Earth/Moon"
+    GUI = {
+        Name = "Moon Trail",
+        Path = "/Solar System/Planets/Earth/Moon"
+    }
 }


--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Amateur Radio",
+    Url = "http://www.celestrak.com/NORAD/elements/amateur.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Experimental",
+    Url = "http://www.celestrak.com/NORAD/elements/x-comm.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Geostationary",
+    Url = "http://celestrak.com/NORAD/elements/geo.txt",
+    TrailColor = { 0.9, 0.9, 0.0 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "GlobalStar",
+    Url = "http://www.celestrak.com/NORAD/elements/globalstar.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Gorizont",
+    Url = "http://www.celestrak.com/NORAD/elements/gorizont.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Intelsat",
+    Url = "http://www.celestrak.com/NORAD/elements/intelsat.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Iridium",
+    Url = "http://www.celestrak.com/NORAD/elements/iridium.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Iridium NEXT",
+    Url = "http://www.celestrak.com/NORAD/elements/iridium-NEXT.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Molniya",
+    Url = "http://www.celestrak.com/NORAD/elements/molniya.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Orbcomm",
+    Url = "http://www.celestrak.com/NORAD/elements/orbcomm.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Other comm",
+    Url = "http://www.celestrak.com/NORAD/elements/other-comm.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Raduga",
+    Url = "http://www.celestrak.com/NORAD/elements/raduga.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "SES",
+    Url = "http://www.celestrak.com/NORAD/elements/ses.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Breeze-M Breakup",
+    Url = "http://www.celestrak.com/NORAD/elements/2012-044.txt",
+    TrailColor = { 0.25, 0.35, 0.45 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, true)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Fengyun Debris",
+    Url = "http://www.celestrak.com/NORAD/elements/1999-025.txt",
+    TrailColor = { 0.25, 0.35, 0.45 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, true)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Iridium 33 Debris",
+    Url = "http://www.celestrak.com/NORAD/elements/iridium-33-debris.txt",
+    TrailColor = { 0.25, 0.35, 0.45 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, true)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
--- a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Kosmos 2251 Debris",
+    Url = "http://www.celestrak.com/NORAD/elements/cosmos-2251-debris.txt",
+    TrailColor = { 0.25, 0.35, 0.45 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, true)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "100 Brightest",
+    Url = "http://www.celestrak.com/NORAD/elements/visual.txt",
+    TrailColor = { 0.55, 0.25, 0.65 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, true)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
--- a/Show More
+++ b/Show More