@sapui5/sap.ushell_abap 1.145.0 → 1.146.0

package/src/main/js/sap/ushell_abap/bootstrap/evo/XhrLogonEventHandler.js

@@ -1,11 +1,11 @@
 // Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "./abap.bootstrap.utils",
+    "sap/ushell_abap/bootstrap/evo/abap.bootstrap.utils",
     "sap/base/util/ObjectPath",
     "sap/base/Log"
 ], (
-    oAbapUtils,
+    abapBootstrapUtils,
     ObjectPath,
     Log
 ) => {
@@ -126,7 +126,7 @@ sap.ui.define([
      * @private
      */
     XhrLogonEventHandler.prototype._logoffAndRedirect = function () {
-        const sLocationHref = oAbapUtils.getLocationHref();
+        const sLocationHref = abapBootstrapUtils.getLocationHref();
         const sClientId = ObjectPath.get("sap-ushell-config.services.Container.adapter.config.client");
 
         const sUrl = new URI("/sap/public/bc/icf/logoff")

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap-def-dev.js

@@ -1,32 +1,32 @@
 // Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 sap.ui.define([
-    "./abap.configure.ushell",
-    "./abap.configure.theme",
-    "./abap.load.launchpad",
-    "./boottask",
+    "sap/ushell_abap/bootstrap/evo/abap.configure.ushell",
+    "sap/ushell_abap/bootstrap/evo/abap.configure.theme",
+    "sap/ushell_abap/bootstrap/evo/abap.load.launchpad",
+    "sap/ushell_abap/bootstrap/evo/boottask",
     "sap/ushell/bootstrap/common/common.configure.ui5",
     "sap/ushell/bootstrap/common/common.configure.ui5.extractLibs",
     "sap/ushell/bootstrap/common/common.debug.mode",
     "sap/ushell/bootstrap/common/common.load.bootstrapExtension"
 ], (
-    fnConfigureUshell,
-    fnConfigureTheme,
-    fnLoadLaunchpad,
-    oBoottask,
-    fnConfigureUi5,
-    fnExtractUi5LibsFromUshellConfig,
-    oDebugMode,
-    fnLoadBootstrapExtension
+    abapConfigureUshell,
+    abapConfigureTheme,
+    abapLoadLaunchpad,
+    boottask,
+    commonConfigureUi5,
+    commonConfigureUi5ExtractLibs,
+    commonDebugMode,
+    commonLoadBootstrapExtension
 ) => {
     "use strict";
 
-    window["sap-ui-debug"] = oDebugMode.isDebug(); // use in LaunchPageAdapter
-    const oUShellConfig = fnConfigureUshell();
-    const {theme, themeRoots} = fnConfigureTheme(oUShellConfig);
+    window["sap-ui-debug"] = commonDebugMode.isDebug(); // use in LaunchPageAdapter
+    const oUShellConfig = abapConfigureUshell();
+    const {theme, themeRoots} = abapConfigureTheme(oUShellConfig);
 
-    fnConfigureUi5({
+    commonConfigureUi5({
         ushellConfig: oUShellConfig,
-        libs: fnExtractUi5LibsFromUshellConfig(oUShellConfig),
+        libs: commonConfigureUi5ExtractLibs(oUShellConfig),
         theme: theme,
         themeRoots: themeRoots,
         platform: "abap",
@@ -34,9 +34,9 @@ sap.ui.define([
             abap: "sap.ushell_abap.adapters.abap",
             hana: "sap.ushell_abap.adapters.hana"
         },
-        bootTask: oBoottask.start,
-        onInitCallback: fnLoadLaunchpad
+        bootTask: boottask.start,
+        onInitCallback: abapLoadLaunchpad
     });
 
-    fnLoadBootstrapExtension(oUShellConfig);
+    commonLoadBootstrapExtension(oUShellConfig);
 });

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap-def.js

@@ -1,34 +1,34 @@
 // Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 sap.ui.define([
-    "./abap.configure.ushell",
-    "./abap.configure.theme",
-    "./abap.load.launchpad",
-    "./boottask",
+    "sap/ushell_abap/bootstrap/evo/abap.configure.ushell",
+    "sap/ushell_abap/bootstrap/evo/abap.configure.theme",
+    "sap/ushell_abap/bootstrap/evo/abap.load.launchpad",
+    "sap/ushell_abap/bootstrap/evo/boottask",
     "sap/ushell/bootstrap/common/common.configure.ui5",
     "sap/ushell/bootstrap/common/common.configure.ui5.extractLibs",
     "sap/ushell/bootstrap/common/common.load.bootstrapExtension",
     "sap/ushell/bootstrap/common/common.debug.mode",
     "sap/ushell/bootstrap/common/common.load.core-min"
 ], (
-    fnConfigureUshell,
-    fnConfigureTheme,
-    fnLoadLaunchpad,
-    oBoottask,
-    fnConfigureUi5,
-    fnExtractUi5LibsFromUshellConfig,
-    fnLoadBootstrapExtension,
-    oDebugMode,
-    oCoreMinLoader
+    abapConfigureUshell,
+    abapConfigureTheme,
+    abapLoadLaunchpad,
+    boottask,
+    commonConfigureUi5,
+    commonConfigureUi5ExtractLibs,
+    commonLoadBootstrapExtension,
+    commonDebugMode,
+    commonLoadCoreMin
 ) => {
     "use strict";
 
-    window["sap-ui-debug"] = oDebugMode.isDebug(); // use in LaunchPageAdapter
-    const oUShellConfig = fnConfigureUshell();
-    const {theme, themeRoots} = fnConfigureTheme(oUShellConfig);
+    window["sap-ui-debug"] = commonDebugMode.isDebug(); // use in LaunchPageAdapter
+    const oUShellConfig = abapConfigureUshell();
+    const {theme, themeRoots} = abapConfigureTheme(oUShellConfig);
 
-    fnConfigureUi5({
+    commonConfigureUi5({
         ushellConfig: oUShellConfig,
-        libs: fnExtractUi5LibsFromUshellConfig(oUShellConfig),
+        libs: commonConfigureUi5ExtractLibs(oUShellConfig),
         theme: theme,
         themeRoots: themeRoots,
         platform: "abap",
@@ -36,10 +36,10 @@ sap.ui.define([
             abap: "sap.ushell_abap.adapters.abap",
             hana: "sap.ushell_abap.adapters.hana"
         },
-        bootTask: oBoottask.start,
-        onInitCallback: fnLoadLaunchpad
+        bootTask: boottask.start,
+        onInitCallback: abapLoadLaunchpad
     });
 
-    oCoreMinLoader.load(oUShellConfig.ushell.customPreload);
-    fnLoadBootstrapExtension(oUShellConfig);
+    commonLoadCoreMin.load(oUShellConfig.ushell.customPreload);
+    commonLoadBootstrapExtension(oUShellConfig);
 });

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.bootstrap.utils.js

@@ -5,7 +5,7 @@ sap.ui.define([
     "sap/ushell_abap/pbServices/ui2/Utils"
 ], (
     ObjectPath,
-    Utils
+    ui2Utils
 ) => {
     "use strict";
 
@@ -23,7 +23,7 @@ sap.ui.define([
      * @private
      */
     utils.getUrlParameterValue = function (sValue, mMap) {
-        const mParameterMap = mMap || Utils.getParameterMap();
+        const mParameterMap = mMap || ui2Utils.getParameterMap();
         return mParameterMap[sValue] && mParameterMap[sValue][0];
     };
 
@@ -105,7 +105,7 @@ sap.ui.define([
      * sap-ushell-config merge rules Note that the JSON serialized content of
      * oConfigToMerge is used, thus JSON serialization restrictions apply (e.g.
      * Infinity -> null ) Note that it is thus not possible to remove a
-     * property definition or overriding with  {"propname" : undefined}, one
+     * property definition or overriding with  {"propName" : undefined}, one
      * has to override with null or 0 etc.
      *
      * Note: Do not use this method for general merging of other objects, as

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.configure.ushell.js

@@ -14,14 +14,19 @@
  * It furthermore calculates if FLP pages get activated and if needed sets up
  * the configuration environment to run these.
  *
- * @version 1.145.0
+ * @version 1.146.0
  */
 sap.ui.define([
-    "./abap.constants",
+    "sap/ushell_abap/bootstrap/evo/abap.constants",
     "sap/ushell/bootstrap/common/common.configure.ushell",
     "sap/base/util/ObjectPath",
     "sap/base/Log"
-], (oAbapConstants, fnConfigureUshellCommon, ObjectPath, Log) => {
+], (
+    abapConstants,
+    commonConfigureUshell,
+    ObjectPath,
+    Log
+) => {
     "use strict";
 
     function logServerSideMessages (config) {
@@ -146,7 +151,7 @@ sap.ui.define([
      */
     function configureUshell () {
         // Use default configuration
-        const oConfig = fnConfigureUshellCommon(oAbapConstants);
+        const oConfig = commonConfigureUshell(abapConstants);
 
         // Write any warnings and errors related to server-side config to console.
         logServerSideMessages(oConfig);

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.constants.js

@@ -1,13 +1,18 @@
 // Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 sap.ui.define([
-
-], () => {
+], (
+) => {
     "use strict";
 
     return {
         defaultUshellConfig: {
             defaultRenderer: "fiori2",
             ushell: {
+                menu: {
+                    personalization: {
+                        enabled: true
+                    }
+                },
                 home: {
                     tilesWrappingType: "Hyphenated"
                 },
@@ -42,6 +47,7 @@ sap.ui.define([
                             sessionTimeoutReminderInMinutes: 5,
                             sessionTimeoutIntervalInMinutes: -1,
                             sessionTimeoutTileStopRefreshIntervalInMinutes: 15,
+                            displayUserId: true,
                             enableContentDensity: true,
                             enableAutomaticSignout: true,
                             enablePersonalization: true,

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.load.launchpad.js

@@ -1,6 +1,6 @@
 // Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 sap.ui.define([
-    "./boottask",
+    "sap/ushell_abap/bootstrap/evo/boottask",
     "sap/ushell_abap/pbServices/ui2/contracts/bag",
     "sap/ushell_abap/pbServices/ui2/contracts/configuration",
     "sap/ushell_abap/pbServices/ui2/contracts/configurationUi",
@@ -13,7 +13,7 @@ sap.ui.define([
     "sap/ushell_abap/pbServices/ui2/contracts/actions",
     "sap/ushell_abap/pbServices/ui2/contracts/types"
 ], (
-    Boottask
+    boottask
     // ui2ContractsBag,
     // ui2Configuration,
     // ui2ConfigurationUi,
@@ -67,6 +67,6 @@ sap.ui.define([
             });
             IconFonts.registerFiori2IconFont();
         });
-        Boottask.afterBootstrap();
+        boottask.afterBootstrap();
     };
 });

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.request.pageset.js

@@ -1,16 +1,16 @@
 // Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "./abap.bootstrap.utils",
+    "sap/ushell_abap/bootstrap/evo/abap.bootstrap.utils",
     "sap/ushell/bootstrap/common/common.util",
     "sap/ui/thirdparty/jquery",
     "sap/ushell_abap/pbServices/ui2/Utils",
     "sap/base/Log"
 ], (
-    oAbapUtils,
-    BootstrapUtils,
+    abapBootstrapUtils,
+    commonUtil,
     jQuery,
-    Utils,
+    ui2Utils,
     Log
 ) => {
     "use strict";
@@ -26,7 +26,7 @@ sap.ui.define([
     const S_PAGE_SETS_FALLBACK_URL_RELATIVE = "PageSets('%2FUI2%2FFiori2LaunchpadHome')";
 
     // Check (only once for this file) if sap-statistics is set in query parameter or local storage
-    let bSapStatistics = BootstrapUtils.isSapStatisticsSet();
+    let bSapStatistics = commonUtil.isSapStatisticsSet();
 
     /**
      * Determines the URL for the PageSets OData service from the startup service result. If the URL is not set
@@ -47,7 +47,7 @@ sap.ui.define([
      */
     function getAndAdjustServiceURL (oStartupCallResult, sServicePropertyName, sFallbackBaseUrl, sFallbackRelativeUrl, sFallbackExpand) {
         let sServiceUrl;
-        let oServiceData; // shortcut for oStartupCallResult.services[sServicePropetyName]
+        let oServiceData; // shortcut for oStartupCallResult.services[sServicePropertyName]
         let bFallbackApplied = false;
 
         if (oStartupCallResult.services) {
@@ -139,7 +139,7 @@ sap.ui.define([
      * the URL for the PageSets OData service
      */
     function getAndAdjustPageSetServiceURL (oStartupCallResult) {
-        const sUI2CacheDisable = oAbapUtils.getUrlParameterValue("sap-ui2-cache-disable");
+        const sUI2CacheDisable = abapBootstrapUtils.getUrlParameterValue("sap-ui2-cache-disable");
         if (sUI2CacheDisable && oStartupCallResult && oStartupCallResult.services && oStartupCallResult.services.pbFioriHome) {
             oStartupCallResult.services.pbFioriHome["sap-ui2-cache-disable"] = sUI2CacheDisable;
         }
@@ -168,7 +168,7 @@ sap.ui.define([
         // the responses from the "cache", even if UI5 bootstrap is faster than the
         // OData requests
         sap.ui.require(["sap/ui/thirdparty/datajs"], (datajs) => {
-            OData.read.$cache = OData.read.$cache || new Utils.Map();
+            OData.read.$cache = OData.read.$cache || new ui2Utils.Map();
             OData.read.$cache.put(sUrl, oDeferred.promise());
         });
         return oDeferred;
@@ -185,7 +185,7 @@ sap.ui.define([
      *    CSRF token and the response message
      */
     function requestOData (sUrl, oStartupResult, fnCallback) {
-        const oXHR = oAbapUtils.createAndOpenXHR(sUrl, oStartupResult);
+        const oXHR = abapBootstrapUtils.createAndOpenXHR(sUrl, oStartupResult);
         // set sap-statistics header, see
         // http://help.sap.com/saphelp_nw74/helpdata/de/40/93b81292194d6a926e105c10d5048d/content.htm
         if (bSapStatistics) {

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.request.startup.js

@@ -1,15 +1,15 @@
 // Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 sap.ui.define([
-    "./abap.bootstrap.utils",
+    "sap/ushell_abap/bootstrap/evo/abap.bootstrap.utils",
     "sap/base/util/ObjectPath",
     "sap/base/Log",
     "sap/ushell_abap/pbServices/ui2/Utils",
     "sap/ushell/utils"
 ], (
-    oAbapUtils,
+    abapBootstrapUtils,
     ObjectPath,
     Log,
-    Utils,
+    ui2Utils,
     ushellUtils
 ) => {
     "use strict";
@@ -30,7 +30,7 @@ sap.ui.define([
      */
     function requestStartup (sQuery, aParametersFromUrl, oStartupConfig) {
         let sRequestUrl = "/sap/bc/ui2/start_up?";
-        const mParameterMap = Utils.getParameterMap();
+        const mParameterMap = ui2Utils.getParameterMap();
         let oXHR;
 
         if (sQuery) {
@@ -55,12 +55,12 @@ sap.ui.define([
         aParametersFromUrl.forEach(copyParameter);
         sRequestUrl += `shellType=${ushellUtils.getShellType()}&depth=0`;
         if (oStartupConfig) {
-            sRequestUrl += oAbapUtils.getCacheIdAsQueryParameter(oStartupConfig);
-            oXHR = oAbapUtils.createAndOpenXHR(sRequestUrl, oStartupConfig); // XMLHttpRequest + headers
+            sRequestUrl += abapBootstrapUtils.getCacheIdAsQueryParameter(oStartupConfig);
+            oXHR = abapBootstrapUtils.createAndOpenXHR(sRequestUrl, oStartupConfig); // XMLHttpRequest + headers
         }
 
         return new Promise((resolve, reject) => {
-            Utils.get(
+            ui2Utils.get(
                 sRequestUrl,
                 false, /* xml=*/
                 (sStartupCallResult) => {
@@ -133,7 +133,7 @@ sap.ui.define([
      *    Result of the GET request should be resolved
      */
     oStartupHandler.requestDirectStart = function (oStartupConfig, oParsedHash, oInitialKeys) {
-        const sFormFactor = Utils.getFormFactor();
+        const sFormFactor = ui2Utils.getFormFactor();
         let sQueryPath = "";
 
         sQueryPath = `so=${oParsedHash.semanticObject}&action=${oParsedHash.action}`;

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.theme.handler.js

@@ -9,7 +9,11 @@ sap.ui.define([
     "sap/ui/thirdparty/URI",
     "sap/base/Log",
     "sap/ushell/bootstrap/common/common.read.metatags"
-], (URI, Log, oMetaTagHandler) => {
+], (
+    URI,
+    Log,
+    commonReadMetatags
+) => {
     "use strict";
 
     const oThemeHandler = {};
@@ -21,7 +25,7 @@ sap.ui.define([
      * @returns {boolean} if it is part of the allowlist
      */
     function validateThemeOrigin (sOrigin) {
-        const aArrayOfAllowedOrigins = oMetaTagHandler.readMetaTags(
+        const aArrayOfAllowedOrigins = commonReadMetatags.readMetaTags(
             "sap-allowed-theme-origins",
             // only one allowed origin shall be provided
             (sMetaNodeContent) => {

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.xhrlogon.LibLoader.js

@@ -3,12 +3,12 @@
 sap.ui.define([
     "sap/ushell/bootstrap/common/common.debug.mode"
 ], (
-    DebugMode
+    commonDebugMode
 ) => {
     "use strict";
 
     const pLoadXhrLib = new Promise((resolve) => {
-        const sFileName = `sap/ushell_abap/thirdparty/sap-xhrlib-esm${DebugMode.isDebug() ? "-dbg" : ""}.js`;
+        const sFileName = `sap/ushell_abap/thirdparty/sap-xhrlib-esm${commonDebugMode.isDebug() ? "-dbg" : ""}.js`;
         const sPath = sap.ui.require.toUrl(sFileName);
         import(sPath).then((oModule) => {
             resolve(oModule.xhrlib);

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.xhrlogon.configure.js

@@ -3,7 +3,7 @@ sap.ui.define([
     "sap/ushell/bootstrap/common/common.util",
     "sap/base/Log"
 ], (
-    oUtils,
+    commonUtil,
     Log
 ) => {
     "use strict";
@@ -40,7 +40,7 @@ sap.ui.define([
      * @private
      */
     function initXhrLogonIgnoreList (oXHRLogonManager) {
-        const sOrigin = oUtils.getLocationOrigin();
+        const sOrigin = commonUtil.getLocationOrigin();
         const sUi5ResourceRootUrl = sap.ui.require.toUrl("");
 
         // add "/" to origin, as otherwise the following use case will match:

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.xhrlogon.handler.js

@@ -6,9 +6,9 @@ sap.ui.define([
     "sap/ushell_abap/bootstrap/evo/XhrLogonEventHandler",
     "sap/base/Log"
 ], (
-    oXhrLibLoader,
-    oConfigureXhrLogon,
-    oAbapUtils,
+    abapXhrlogonLibLoader,
+    abapXhrlogonConfigure,
+    abapBootstrapUtils,
     XhrLogonEventHandler,
     Log
 ) => {
@@ -24,7 +24,7 @@ sap.ui.define([
      * @returns {string} the logon mode
      */
     oHandler.getLogonMode = function (oConfig) {
-        return oAbapUtils.getUrlParameterValue("sap-ushell-xhrLogon-mode")
+        return abapBootstrapUtils.getUrlParameterValue("sap-ushell-xhrLogon-mode")
             || oConfig && oConfig.xhrLogon && oConfig.xhrLogon.mode
             || "frame";
     };
@@ -39,7 +39,7 @@ sap.ui.define([
      * @private
      */
     oHandler.initXhrLogon = function (oConfig) {
-        oXhrLibLoader.getLib().then((oXhrLogonLib) => {
+        abapXhrlogonLibLoader.getLib().then((oXhrLogonLib) => {
             const sLogonMode = oHandler.getLogonMode(oConfig);
             const oXhrLogonEventHandler = oHandler.createXhrLogonEventHandler(window, sLogonMode);
             const oLogonManager = oXhrLogonLib.LogonManager.getInstance();
@@ -60,8 +60,8 @@ sap.ui.define([
                     null, "sap.ushell_abap.bootstrap.evo.abap.xhrlogon.handler");
             }
 
-            oXhrLogonLib.Log.set(oConfigureXhrLogon.createUi5ConnectedXhrLogger());
-            oConfigureXhrLogon.initXhrLogonIgnoreList(oXHRLogonManager);
+            oXhrLogonLib.Log.set(abapXhrlogonConfigure.createUi5ConnectedXhrLogger());
+            abapXhrlogonConfigure.initXhrLogonIgnoreList(oXHRLogonManager);
         });
     };
 

package/src/main/js/sap/ushell_abap/bootstrap/evo/boottask.js

@@ -2,26 +2,26 @@
 
 sap.ui.define([
     "sap/ushell_abap/bootstrap/evo/abap.xhrlogon.LibLoader",
-    "./abap.bootstrap.utils",
-    "./abap.request.startup",
-    "./abap.request.pageset",
-    "./abap.xhrlogon.handler",
-    "./abap.theme.handler",
+    "sap/ushell_abap/bootstrap/evo/abap.bootstrap.utils",
+    "sap/ushell_abap/bootstrap/evo/abap.request.startup",
+    "sap/ushell_abap/bootstrap/evo/abap.request.pageset",
+    "sap/ushell_abap/bootstrap/evo/abap.xhrlogon.handler",
+    "sap/ushell_abap/bootstrap/evo/abap.theme.handler",
     "sap/ushell/EventHub",
     "sap/ui/performance/trace/initTraces",
     "sap/base/util/ObjectPath",
     "sap/base/Log",
     "sap/ushell_abap/pbServices/ui2/Utils",
     "sap/ushell/bootstrap/common/common.util",
-    "./SAPCompanionConditionSetter",
+    "sap/ushell_abap/bootstrap/evo/SAPCompanionConditionSetter",
     "sap/ushell/utils/UrlParsing"
 ], (
-    oXhrLibLoader,
-    oAbapUtils,
-    oStartupHandler,
-    oPageSetHandler,
-    oXhrHandler,
-    oThemeHandler,
+    abapXhrlogonLibLoader,
+    abapBootstrapUtils,
+    abapRequestStartup,
+    abapRequestPageset,
+    abapXhrlogonHandler,
+    abapThemeHandler,
     EventHub,
     initTraces,
     ObjectPath,
@@ -113,7 +113,7 @@ sap.ui.define([
      */
     // TODO Refactor: Align with URLParsing.getShellHash
     function getFullShellHash () {
-        const sHref = oAbapUtils.getLocationHref();
+        const sHref = abapBootstrapUtils.getLocationHref();
         const iHashIndex = sHref.indexOf("#");
         if (iHashIndex < 0) {
             return "";
@@ -367,7 +367,7 @@ sap.ui.define([
     function determineUrlTheme (sSystemThemeRoot) {
         let aThemeParts;
 
-        const sThemeUrlParameter = oAbapUtils.getUrlParameterValue("sap-theme") || oAbapUtils.getUrlParameterValue("sap-ui-theme");
+        const sThemeUrlParameter = abapBootstrapUtils.getUrlParameterValue("sap-theme") || abapBootstrapUtils.getUrlParameterValue("sap-ui-theme");
         if (sThemeUrlParameter) {
             if (sThemeUrlParameter.indexOf("@") > 0) {
                 aThemeParts = sThemeUrlParameter.split("@", 2);
@@ -424,7 +424,7 @@ sap.ui.define([
         const iIndex = theme.indexOf("@");
         if (iIndex >= 0) {
             const sThemeRoot = sTheme.slice(iIndex + 1);
-            return oThemeHandler.isThemeRootSafe(sThemeRoot);
+            return abapThemeHandler.isThemeRootSafe(sThemeRoot);
         }
         return true;
     }
@@ -498,7 +498,7 @@ sap.ui.define([
      */
     function processStartup (oStartupResult) {
         const mParameterMap = ui2Utils.getParameterMap();
-        const sRequestLocale = oAbapUtils.getUrlParameterValue("sap-locale", mParameterMap);
+        const sRequestLocale = abapBootstrapUtils.getUrlParameterValue("sap-locale", mParameterMap);
         const oUshellConfig = {
             services: {}
         };
@@ -665,7 +665,7 @@ sap.ui.define([
             addInitialKey(/(\?|&)(sap-system=[A-Z0-9]+)/, sHash);
             addInitialKey(/(\?|&|[/])(sap-iapp-state=[A-Z0-9]+)/, sFullHash);
 
-            oRequestPromise = oStartupHandler.requestDirectStart(oStartupResult, oRequestSegment, oInitialKeys);
+            oRequestPromise = abapRequestStartup.requestDirectStart(oStartupResult, oRequestSegment, oInitialKeys);
 
             oAppStateConfig.initialAppStatesPromise = oRequestPromise.then((oDirectStart) => {
                 addInitialAppState(oInitialAppStates, oDirectStart, oInitialKeys, "sap-intent-param", "iparState");
@@ -704,7 +704,7 @@ sap.ui.define([
             function fnOnRendererCreated () {
                 Log.info("Direct application start: resolving component waitFor promise after shell renderer created event fired.");
                 resolve();
-                getContainer().detachRendererCreatedEvent(fnOnRendererCreated);
+                getContainer().detachRendererCreatedInternal(fnOnRendererCreated);
             }
 
             EventHub.once("ShellNavigationInitialized").do(() => {
@@ -714,7 +714,7 @@ sap.ui.define([
                     resolve();
                 } else {
                     // the renderer should be created when the shell navigation is initialized, just to but be robust
-                    getContainer().attachRendererCreatedEvent(fnOnRendererCreated);
+                    getContainer().attachRendererCreatedInternal(fnOnRendererCreated);
                 }
             });
         });
@@ -733,7 +733,7 @@ sap.ui.define([
             window["sap-ushell-config"].ushell.spaces && window["sap-ushell-config"].ushell.spaces.enabled) {
             oBoottask._loadPage(sShellHash); // earliest point available to load page object
         }
-        oXhrLibLoader.getLib().then((oXhrLogonLib) => {
+        abapXhrlogonLibLoader.getLib().then((oXhrLogonLib) => {
             const oFrameLogonManager = oXhrLogonLib.FrameLogonManager.getInstance();
             getContainer().oFrameLogonManager = oFrameLogonManager;
         });
@@ -781,16 +781,12 @@ sap.ui.define([
                     return getContainer().getServiceAsync("NavTargetResolutionInternal");
                 })
                 .then((oNavTargetResolutionInternal) => {
-                    const oParsedHash = UrlParsing.parseShellHash(sShellHash);
-
                     oNavTargetResolutionInternal.resolveHashFragment(UrlParsing.ensureLeadingHash(sShellHash))
                         .done((oResolutionResult) => {
                             sap.ui.require(["sap/ushell/services/AppConfiguration"], (AppConfiguration) => {
                                 AppConfiguration.setCurrentApplication(oResolutionResult);
 
                                 if (oResolutionResult && oResolutionResult.ui5ComponentName) {
-                                    const sBasicHash = UrlParsing.constructBasicHash(oParsedHash);
-                                    oResolutionResult.ui5ComponentId = `application-${sBasicHash}-component`;
                                     // create UI5 component early
                                     getContainer().getServiceAsync("Ui5ComponentLoader").then((oUi5ComponentLoader) => {
                                         oUi5ComponentLoader.createComponent(
@@ -879,14 +875,14 @@ sap.ui.define([
      * @param {object} fnCallback To be called for UI5 Core during boot process
      */
     function start (fnCallback) {
-        oXhrHandler.initXhrLogon(window["sap-ushell-config"]);
+        abapXhrlogonHandler.initXhrLogon(window["sap-ushell-config"]);
 
         // initialize UI5 performance tracing (FESR) before first request is sent, so that this is also instrumented
         initTraces();
 
         // fire start-up request if direct start also indicates suppression of pageset request
         // must be kept before success handler of requestStartUp
-        oStartupHandler.requestStartupConfig()
+        abapRequestStartup.requestStartupConfig()
             .catch((oError) => {
                 Log.error("start_up request failed:", oError, "sap.ushell_abap.bootstrap");
                 return {};
@@ -918,9 +914,9 @@ sap.ui.define([
                 if (isHomepageHash(sHash) && !ObjectPath.get("sap-ushell-config.ushell.spaces.enabled")) {
                     // do not create cache entries for PageSet and compact TMs
                     // otherwise the FLP will freeze when returning to HOME from the cold started app (???)
-                    oPageSetHandler.requestPageSet(oStartupResult);
+                    abapRequestPageset.requestPageSet(oStartupResult);
                 }
-                const oTMPromise = oStartupHandler.requestFullTM(oStartupResult);
+                const oTMPromise = abapRequestStartup.requestFullTM(oStartupResult);
                 oClientSideTargetResolutionAdapterConfig.navTargetDataPromise = oTMPromise;
                 // Do not issue the separate compact request for the launchpage adapter, as it was done in the earlier FLP versions.
                 // Reuse the existing full target mappings request that is sent in any case.