diff --git a/html/autocomplete.php b/html/autocomplete.php
index 4606ac15e4250a72550cabcc5a83dcfc911d437e..899b0f3a0930e5e086b49d7ee2ee8d286c430ce4 100644
--- a/html/autocomplete.php
+++ b/html/autocomplete.php
@@ -29,7 +29,7 @@ session::start();
 reset_errors();
 
 /* Logged in? Simple security check */
-if (!session::global_is_set('ui')) {
+if (!session::is_set('ui')) {
   logging::log('security', 'unknown', '', [], 'Error: autocomplete.php called without session');
   header('Location: index.php');
   exit;
diff --git a/html/getbin.php b/html/getbin.php
index 3fe6990d53ed9fa2d685fb0ba2268d27a84773b6..82a6c6e0507a174eddba0342f9e6192f3293da02 100644
--- a/html/getbin.php
+++ b/html/getbin.php
@@ -30,7 +30,7 @@ session::start();
 reset_errors();
 
 /* Logged in? Simple security check */
-if (!session::global_is_set('ui')) {
+if (!session::is_set('ui')) {
   logging::log('security', 'unknown', '', [], 'Error: getbin.php called without session');
   header('Location: index.php');
   exit;
diff --git a/html/geticon.php b/html/geticon.php
index beec687c99e550276b0c6b2d0535d8a2b53ac8f4..a547e05bfc446b1ea1e2cad821648a8e03947dc9 100644
--- a/html/geticon.php
+++ b/html/geticon.php
@@ -28,7 +28,7 @@ session::start();
 reset_errors();
 
 $theme = '';
-if (session::global_is_set('config')) {
+if (session::is_set('config')) {
   $config = session::global_get('config');
   $theme  = $config->get_cfg_value('theme');
 } else {
diff --git a/html/index.php b/html/index.php
index 861af49be529b8b9a4af8c6e697ef886fcd93dcf..cab372fba8f11b952ace5dffd64644529d1c8033 100644
--- a/html/index.php
+++ b/html/index.php
@@ -40,7 +40,7 @@ header('X-Frame-Options: deny');
 session::start();
 
 if (isset($_REQUEST['signout']) && $_REQUEST['signout']) {
-  if (session::global_is_set('connected')) {
+  if (session::is_set('connected')) {
     $config = session::global_get('config');
     if ($config->get_cfg_value('casActivated') == 'TRUE') {
       require_once('CAS.php');
@@ -87,8 +87,8 @@ if (!is_readable(CONFIG_DIR.'/'.CONFIG_FILE)) {
 
 /* Parse configuration file */
 $config = new config(CONFIG_DIR.'/'.CONFIG_FILE, $BASE_DIR);
-session::global_set('config', $config);
-session::global_set('DEBUGLEVEL', $config->get_cfg_value('DEBUGLEVEL'));
+session::set('config', $config);
+session::set('DEBUGLEVEL', $config->get_cfg_value('DEBUGLEVEL'));
 @DEBUG(DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, 'config');
 
 /* Set template compile directory */
@@ -124,7 +124,7 @@ if (
   ($config->get_cfg_value('httpAuthActivated') == 'TRUE') ||
   ($config->get_cfg_value('httpHeaderAuthActivated') == 'TRUE') ||
   in_array($config->get_cfg_value('LoginMethod'), ['LoginCas', 'LoginHTTPAuth', 'LoginHTTPHeader'])) {
-  session::global_set('DEBUGLEVEL', 0);
+  session::set('DEBUGLEVEL', 0);
 }
 
 /* If SSL is forced, just forward to the SSL enabled site */
diff --git a/html/main.php b/html/main.php
index 62d894212265f383566b9265b4509a02d07e0b51..289db16f3cee542a7e3601516d3e190b558304b7 100644
--- a/html/main.php
+++ b/html/main.php
@@ -45,7 +45,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 @DEBUG(DEBUG_SESSION, __LINE__, __FUNCTION__, __FILE__, $_SESSION, '_SESSION');
 
 /* Logged in? Simple security check */
-if (!session::global_is_set('connected')) {
+if (!session::is_set('connected')) {
   logging::log('security', 'login', '', [], 'main.php called without session - logging out');
   header('Location: index.php?message=nosession');
   exit;
@@ -84,7 +84,7 @@ if (session::global_get('_LAST_PAGE_REQUEST') != '') {
     }
   }
 }
-session::global_set('_LAST_PAGE_REQUEST', time());
+session::set('_LAST_PAGE_REQUEST', time());
 
 
 @DEBUG(DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
@@ -98,7 +98,7 @@ Language::init();
 pluglist::load();
 
 /* Check previous plugin index */
-if (session::global_is_set('plugin_index')) {
+if (session::is_set('plugin_index')) {
   $old_plugin_index = session::global_get('plugin_index');
 } else {
   $old_plugin_index = '';
@@ -143,7 +143,7 @@ if (isset($_GET['plug']) && $plist->plugin_access_allowed($_GET['plug'])) {
   /* set to welcome page as default plugin */
   $plugin_index = 'welcome';
 }
-session::global_set('plugin_index', $plugin_index);
+session::set('plugin_index', $plugin_index);
 
 /* Handle plugin locks.
     - Remove the plugin from session if we switched to another. (cleanup)
@@ -201,17 +201,17 @@ if (($_SERVER['REQUEST_METHOD'] == 'POST')
   && (isset($_POST['delete_lock']) || isset($_POST['open_readonly']))) {
 
   /* Set old Post data */
-  if (session::global_is_set('LOCK_VARS_USED_GET')) {
+  if (session::is_set('LOCK_VARS_USED_GET')) {
     foreach (session::global_get('LOCK_VARS_USED_GET') as $name => $value) {
       $_GET[$name]  = $value;
     }
   }
-  if (session::global_is_set('LOCK_VARS_USED_POST')) {
+  if (session::is_set('LOCK_VARS_USED_POST')) {
     foreach (session::global_get('LOCK_VARS_USED_POST') as $name => $value) {
       $_POST[$name] = $value;
     }
   }
-  if (session::global_is_set('LOCK_VARS_USED_REQUEST')) {
+  if (session::is_set('LOCK_VARS_USED_REQUEST')) {
     foreach (session::global_get('LOCK_VARS_USED_REQUEST') as $name => $value) {
       $_REQUEST[$name] = $value;
     }
@@ -262,6 +262,6 @@ $display  = $smarty->fetch(get_template_path('headers.tpl')).
 echo $display;
 
 /* Save plist and config */
-session::global_set('plist', $plist);
-session::global_set('config', $config);
+session::set('plist', $plist);
+session::set('config', $config);
 reset_errors();
diff --git a/html/setup.php b/html/setup.php
index cd115681d1cf8e78b8c7755380f185f5eb092c42..32381f2c653d10588b37c57daa444964297e7a27 100644
--- a/html/setup.php
+++ b/html/setup.php
@@ -49,7 +49,7 @@ ini_set("session.gc_maxlifetime", 24 * 60 * 60);
 
 /* Start session */
 session::start();
-session::global_set('DEBUGLEVEL', 0);
+session::set('DEBUGLEVEL', 0);
 
 CSRFProtection::check();
 
@@ -74,7 +74,7 @@ if (isset($_POST['lang_selected']) && $_POST['lang_selected'] != '') {
   if (!preg_match('/utf(-)?8$/i', $lang)) {
     $lang .= '.UTF-8';
   }
-} elseif (session::global_is_set('lang')) {
+} elseif (session::is_set('lang')) {
   $lang = session::global_get('lang');
 
   /* Append .UTF-8 to language string if necessary */
@@ -91,9 +91,9 @@ $smarty->assign('lang', preg_replace('/_.*$/', '', $lang));
 $smarty->assign('rtl',  Language::isRTL($lang));
 
 /* Minimal config */
-if (!session::global_is_set('config')) {
+if (!session::is_set('config')) {
   $config = new config('');
-  session::global_set('config', $config);
+  session::set('config', $config);
 }
 $config = session::global_get('config');
 IconTheme::loadThemes('themes');
diff --git a/include/class_Language.inc b/include/class_Language.inc
index 22f4cb04b83b382b414f67d10ae9fbba813ea0c3..1a2f1eea120eecaa46fc2afbbdc2d57951766110 100644
--- a/include/class_Language.inc
+++ b/include/class_Language.inc
@@ -66,19 +66,19 @@ class Language
     $ret = FALSE;
 
     /* Reset plist cache if language changed */
-    if ((!session::global_is_set('lang')) || (session::global_get('lang') != $lang)) {
+    if ((!session::is_set('lang')) || (session::global_get('lang') != $lang)) {
       $ret = TRUE;
-      if (session::global_is_set('plist')) {
+      if (session::is_set('plist')) {
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
           @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, session::global_get('lang'), 'Plist already loaded with language');
         }
         session::global_un_set('plist');
-        session::global_set('lang', $lang);
+        session::set('lang', $lang);
         pluglist::load();
       }
     }
 
-    session::global_set('lang', $lang);
+    session::set('lang', $lang);
     return $ret;
   }
 
diff --git a/include/class_baseSelector.inc b/include/class_baseSelector.inc
index 29fcd50a7baab7a366e46af639b96ad0a12391cc..ccd7de03310911820f90e2adeb93176ea54b205c 100644
--- a/include/class_baseSelector.inc
+++ b/include/class_baseSelector.inc
@@ -130,7 +130,7 @@ class baseSelector
     }
 
     // Save bases to session for autocompletion
-    session::global_set('pathMapping', $this->pathMapping);
+    session::set('pathMapping', $this->pathMapping);
   }
 
   /*!
diff --git a/include/class_config.inc b/include/class_config.inc
index 49759d975469b478b0f97f855cd2bfb9aea54d3f..3f24a6820aea876eb60868f2ab37d31ec3f03a0a 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -95,11 +95,11 @@ class config
     /* Check if class_location.inc has changed, this is the case
         if we have installed or removed plugins. */
     $tmp = stat(CACHE_DIR.'/'.CLASS_CACHE);
-    if (session::global_is_set('class_location.inc:timestamp')
+    if (session::is_set('class_location.inc:timestamp')
       && ($tmp['mtime'] != session::global_get('class_location.inc:timestamp'))) {
       session::global_un_set('plist');
     }
-    session::global_set('class_location.inc:timestamp', $tmp['mtime']);
+    session::set('class_location.inc:timestamp', $tmp['mtime']);
 
     if (($this->filename != '') && ((filemtime($this->filename) != $this->last_modified) || $force)) {
       $this->config_found     = FALSE;
@@ -265,14 +265,14 @@ class config
   function get_credentials ($creds)
   {
     if (isset($_SERVER['HTTP_FDKEY'])) {
-      if (!session::global_is_set('HTTP_FDKEY_CACHE')) {
-        session::global_set('HTTP_FDKEY_CACHE', []);
+      if (!session::is_set('HTTP_FDKEY_CACHE')) {
+        session::set('HTTP_FDKEY_CACHE', []);
       }
       $cache = session::global_get('HTTP_FDKEY_CACHE');
       if (!isset($cache[$creds])) {
         try {
           $cache[$creds] = cred_decrypt($creds, $_SERVER['HTTP_FDKEY']);
-          session::global_set('HTTP_FDKEY_CACHE', $cache);
+          session::set('HTTP_FDKEY_CACHE', $cache);
         } catch (FusionDirectoryException $e) {
           $msg = sprintf(
             _('It seems you are trying to decode something which is not encoded : %s<br/>'."\n".
@@ -398,7 +398,7 @@ class config
     if (isset($this->data['MAIN']['DEBUGLEVEL'])) {
       $debugLevel |= $this->data['MAIN']['DEBUGLEVEL'];
     }
-    session::global_set('DEBUGLEVEL', $debugLevel);
+    session::set('DEBUGLEVEL', $debugLevel);
 
     IconTheme::loadThemes('themes');
 
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index 397842db4156e840d8a76db2f9298d6d2cb46a5c..976f1a6e0bfcc2a296da3e595475b12a11f2e941 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -1337,7 +1337,7 @@ class LDAP
   function get_objectclasses ($force_reload = FALSE)
   {
     /* Return the cached results. */
-    if (class_available('session') && session::global_is_set('LDAP_CACHE::get_objectclasses') && !$force_reload) {
+    if (class_available('session') && session::is_set('LDAP_CACHE::get_objectclasses') && !$force_reload) {
       return session::global_get('LDAP_CACHE::get_objectclasses');
     }
 
@@ -1408,7 +1408,7 @@ class LDAP
       }
     }
     if (class_available('session')) {
-      session::global_set('LDAP_CACHE::get_objectclasses', $objectclasses);
+      session::set('LDAP_CACHE::get_objectclasses', $objectclasses);
     }
 
     return $objectclasses;
@@ -1443,7 +1443,7 @@ class LDAP
    */
   function log ($string)
   {
-    if (session::global_is_set('config')) {
+    if (session::is_set('config')) {
       $cfg = session::global_get('config');
       if (isset($cfg->current['LDAPSTATS']) && preg_match('/true/i', $cfg->current['LDAPSTATS'])) {
         syslog(LOG_INFO, $string);
diff --git a/include/class_passwordRecovery.inc b/include/class_passwordRecovery.inc
index 21eec1644602b22fbc93dde5e21a4d0d0fe0623e..385d3fec75bf626e35e2446d476ccb91081c90bb 100644
--- a/include/class_passwordRecovery.inc
+++ b/include/class_passwordRecovery.inc
@@ -76,8 +76,8 @@ class passwordRecovery extends standAlonePage
 
     /* Got a formular answer, validate and try to log in */
     if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-      if (session::global_is_set('_LAST_PAGE_REQUEST')) {
-        session::global_set('_LAST_PAGE_REQUEST', time());
+      if (session::is_set('_LAST_PAGE_REQUEST')) {
+        session::set('_LAST_PAGE_REQUEST', time());
       }
 
       if (isset($_POST['change'])) {
diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index 801c9670c187244f8c6f04003c5639cc957ab858..96d22ccef88791442b89d40daf9340bce93895c8 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -521,12 +521,12 @@ class pluglist
   static function load ()
   {
     global $config, $plist;
-    if (!session::global_is_set('plist')) {
+    if (!session::is_set('plist')) {
       /* Initially load all classes */
       load_all_classes();
 
       $plist = new pluglist();
-      session::global_set('plist', $plist);
+      session::set('plist', $plist);
       $config->loadPlist($plist);
       $config->resetDepartmentCache();
     } else {
diff --git a/include/class_standAlonePage.inc b/include/class_standAlonePage.inc
index 201e3728a5411a5d7c6cba377acd7dcabdd9229f..1acc9e580b6b37ba5f89b5b41b96dff24454583f 100644
--- a/include/class_standAlonePage.inc
+++ b/include/class_standAlonePage.inc
@@ -41,7 +41,7 @@ class standAlonePage
       session::start();
 
       $config = $this->loadConfig();
-      session::global_set('config', $config);
+      session::set('config', $config);
 
       /* Generate server list */
       $this->directories = [];
@@ -50,7 +50,7 @@ class standAlonePage
       }
 
       $ui = new userinfoNoAuth(get_class($this));
-      session::global_set('ui', $ui);
+      session::set('ui', $ui);
     }
 
     static::init();
@@ -128,7 +128,7 @@ class standAlonePage
 
     /* Parse configuration file */
     $config = new config(CONFIG_DIR.'/'.CONFIG_FILE, $BASE_DIR);
-    session::global_set('DEBUGLEVEL', $config->get_cfg_value('debuglevel'));
+    session::set('DEBUGLEVEL', $config->get_cfg_value('debuglevel'));
     @DEBUG(DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, 'config');
     return $config;
   }
diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index e1995ebaaac3d4caf25680f54680e4665341a9c2..6593680ecb0eb344d0ade261c54843e4da61928c 100644
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -120,7 +120,7 @@ class userinfo
   public function reset_acl_cache ()
   {
     /* Initialize ACL_CACHE */
-    session::global_set('ACL_CACHE', []);
+    session::set('ACL_CACHE', []);
   }
 
   /*!
diff --git a/include/functions.inc b/include/functions.inc
index 27c58f8710cd09b70e44dfd92ae6f1e112066bf4..1ba90e993f7b25fbe6aed2802d1232bd8ce22732 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -405,8 +405,8 @@ function add_lock ($object, $user)
   /* Remember which entries were opened as read only, because we
       don't need to remove any locks for them later.
    */
-  if (!session::global_is_set('LOCK_CACHE')) {
-    session::global_set('LOCK_CACHE', ['']);
+  if (!session::is_set('LOCK_CACHE')) {
+    session::set('LOCK_CACHE', ['']);
   }
   if (is_array($object)) {
     foreach ($object as $obj) {
@@ -487,7 +487,7 @@ function del_lock ($object)
   /* If this object was opened in read only mode then
       skip removing the lock entry, there wasn't any lock created.
     */
-  if (session::global_is_set('LOCK_CACHE')) {
+  if (session::is_set('LOCK_CACHE')) {
     $cache = &session::global_get_ref('LOCK_CACHE');
     if (isset($cache['READ_ONLY'][$object])) {
       unset($cache['READ_ONLY'][$object]);
diff --git a/include/login/class_LoginMethod.inc b/include/login/class_LoginMethod.inc
index 5f5e8f68a27e09a2f78065bdd9a3c8b12d2144d4..1e5b7a04ed60886adb8aa0773c28cd827a46b70e 100644
--- a/include/login/class_LoginMethod.inc
+++ b/include/login/class_LoginMethod.inc
@@ -119,7 +119,7 @@ class LoginMethod
     del_user_locks($ui->dn);
 
     /* Save userinfo and plugin structure */
-    session::global_set('ui', $ui);
+    session::set('ui', $ui);
 
     /* User might have its own language, re-run initLanguage */
     $plistReloaded = Language::init();
@@ -152,8 +152,8 @@ class LoginMethod
     global $config;
     /* Not account expired or password forced change go to main page */
     logging::log('security', 'login', '', [], 'User "'.static::$username.'" logged in successfully.');
-    session::global_set('connected', 1);
-    session::global_set('DEBUGLEVEL', $config->get_cfg_value('DEBUGLEVEL'));
+    session::set('connected', 1);
+    session::set('DEBUGLEVEL', $config->get_cfg_value('DEBUGLEVEL'));
     header('Location: main.php');
     exit;
   }
diff --git a/include/simpleplugin/class_simpleManagement.inc b/include/simpleplugin/class_simpleManagement.inc
index f6ae1d1e7149b57682abe0c0487b9ca26d6d9408..af3951818cf4b9840f2140d39f256cd1b251eca4 100644
--- a/include/simpleplugin/class_simpleManagement.inc
+++ b/include/simpleplugin/class_simpleManagement.inc
@@ -235,7 +235,7 @@ class simpleManagement
     }
 
     // Build filter
-    if (session::global_is_set(get_class($this).'_filter')) {
+    if (session::is_set(get_class($this).'_filter')) {
       $filter = session::global_get(get_class($this).'_filter');
     } else {
       $filter = new filter($this->filterXMLPath);
@@ -558,7 +558,7 @@ class simpleManagement
     // Update filter
     if ($this->filter) {
       $this->filter->update();
-      session::global_set(get_class($this).'_filter', $this->filter);
+      session::set(get_class($this).'_filter', $this->filter);
       session::set('autocomplete', $this->filter);
       if (!$this->filter->isValid()) {
         msg_dialog::display(_('Filter error'), _('The filter is incomplete!'), ERROR_DIALOG);
diff --git a/include/simpleplugin/class_simplePlugin.inc b/include/simpleplugin/class_simplePlugin.inc
index 0c8ae032b92d618e90481cce8297fc55ec0fa1b3..dee42e632a23c7fac4db158ad27e73dde6e0fc5a 100644
--- a/include/simpleplugin/class_simplePlugin.inc
+++ b/include/simpleplugin/class_simplePlugin.inc
@@ -213,7 +213,7 @@ class simplePlugin implements SimpleTab
     /* Check if this entry was opened in read only mode */
     if (($this->dn != 'new') &&
         isset($_POST['open_readonly']) &&
-        session::global_is_set('LOCK_CACHE')
+        session::is_set('LOCK_CACHE')
       ) {
       $cache = session::get('LOCK_CACHE');
       if (isset($cache['READ_ONLY'][$this->dn])) {
diff --git a/plugins/admin/acl/class_aclAssignment.inc b/plugins/admin/acl/class_aclAssignment.inc
index e769eabd50ca3c0d24b11df822c887229de8e7e2..0f0eeea4f5bd4d75ff9801061a265540e622ea5a 100644
--- a/plugins/admin/acl/class_aclAssignment.inc
+++ b/plugins/admin/acl/class_aclAssignment.inc
@@ -343,7 +343,7 @@ class aclAssignment extends simplePlugin
     /* Refresh users ACLs */
     $ui = get_userinfo();
     $ui->loadACL();
-    session::global_set('ui', $ui);
+    session::set('ui', $ui);
   }
 
   function post_save ()
@@ -353,7 +353,7 @@ class aclAssignment extends simplePlugin
     /* Refresh users ACLs */
     $ui = get_userinfo();
     $ui->loadACL();
-    session::global_set('ui', $ui);
+    session::set('ui', $ui);
   }
 
   function foreignKeyUpdate (string $field, $oldvalue, $newvalue, array $source)
diff --git a/plugins/config/class_hooksConfig.inc b/plugins/config/class_hooksConfig.inc
index e914f75e69737822f41343da340aad4c17b599df..d62c1c1fad68f838029ec8814e81fd78c39054c9 100644
--- a/plugins/config/class_hooksConfig.inc
+++ b/plugins/config/class_hooksConfig.inc
@@ -38,7 +38,7 @@ class hooksConfig extends simplePlugin
     global $config;
 
     $plugins = [];
-    if (session::global_is_set('plist')) {
+    if (session::is_set('plist')) {
       $plugins = array_keys(session::global_get('plist')->info);
     }
     sort($plugins);