diff --git a/main/auth/inscription.php b/main/auth/inscription.php
index 59aa5fdc2a..6c931829f2 100755
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
@@ -871,7 +871,7 @@ if ($form->validate()) {
                 }
 
                 // 2. set account inactive
-                Usermanager::disable($user_id);
+                UserManager::disable($user_id);
 
                 // 3. exit the page
                 unset($user_id);
@@ -887,7 +887,7 @@ if ($form->validate()) {
                 UserManager::sendUserConfirmationMail($thisUser);
 
                 // 2. set account inactive
-                Usermanager::disable($user_id);
+                UserManager::disable($user_id);
 
                 // 3. exit the page
                 unset($user_id);
diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php
index 7cf3f9ccec..83afb92633 100755
--- a/main/inc/lib/sessionmanager.lib.php
+++ b/main/inc/lib/sessionmanager.lib.php
@@ -8953,7 +8953,7 @@ SQL;
             $collapsed = $value['value'];
         }
 
-        $userRelSession = Sessionmanager::getUserSession($userId, $sessionId);
+        $userRelSession = self::getUserSession($userId, $sessionId);
         if ($userRelSession) {
             if (isset($userRelSession['collapsed']) && $userRelSession['collapsed'] != '') {
                 $collapsed = $userRelSession['collapsed'];
diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php
index 18154b5bf2..b9cc3a0937 100755
--- a/main/inc/lib/social.lib.php
+++ b/main/inc/lib/social.lib.php
@@ -2185,7 +2185,7 @@ class SocialManager extends UserManager
             $userInfo['has_certificates'] = 1;
         }
 
-        $userInfo['is_admin'] = Usermanager::is_admin($userId);
+        $userInfo['is_admin'] = UserManager::is_admin($userId);
 
         $languageId = api_get_language_id($userInfo['language']);
         $languageInfo = api_get_language_info($languageId);
diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index cba9c44b49..ae181118c6 100755
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -3238,7 +3238,7 @@ class UserManager
             $collapsed = '';
             $collapsedAction = '';
             if ($collapsable) {
-                $collapsableData = Sessionmanager::getCollapsableData(
+                $collapsableData = SessionManager::getCollapsableData(
                     $user_id,
                     $session_id,
                     $extraField,
diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php
index 09dfaca2e6..629394fd75 100755
--- a/main/inc/lib/userportal.lib.php
+++ b/main/inc/lib/userportal.lib.php
@@ -1582,7 +1582,7 @@ class IndexManager
                                 $params['show_actions'] = SessionManager::cantEditSession($session_id);
 
                                 if ($collapsable) {
-                                    $collapsableData = Sessionmanager::getCollapsableData(
+                                    $collapsableData = SessionManager::getCollapsableData(
                                         $user_id,
                                         $session_id,
                                         $extraFieldValue,
@@ -1736,7 +1736,7 @@ class IndexManager
                                     $sessionParams[0]['is_future'] = $markAsFuture;
 
                                     if ($collapsable) {
-                                        $collapsableData = Sessionmanager::getCollapsableData(
+                                        $collapsableData = SessionManager::getCollapsableData(
                                             $user_id,
                                             $session_id,
                                             $extraFieldValue,
diff --git a/main/social/profile.php b/main/social/profile.php
index af399ee241..0ca3c237ae 100755
--- a/main/social/profile.php
+++ b/main/social/profile.php
@@ -394,7 +394,7 @@ $tpl->assign('social_right_information', $socialRightInformation);
 $tpl->assign('social_auto_extend_link', $socialAutoExtendLink);
 
 $formModalTpl = new Template();
-$formModalTpl->assign('invitation_form', MessageManager::generate_invitation_form('send_invitation'));
+$formModalTpl->assign('invitation_form', MessageManager::generate_invitation_form());
 $template = $formModalTpl->get_template('social/form_modals.tpl');
 $formModals = $formModalTpl->fetch($template);
 
diff --git a/main/social/search.php b/main/social/search.php
index 89c1cb3baf..3b10cb4731 100755
--- a/main/social/search.php
+++ b/main/social/search.php
@@ -247,7 +247,7 @@ $tpl->assign('social_search', $block_search);
 $tpl->assign('search_form', $searchForm);
 
 $formModalTpl = new Template();
-$formModalTpl->assign('invitation_form', MessageManager::generate_invitation_form('send_invitation'));
+$formModalTpl->assign('invitation_form', MessageManager::generate_invitation_form());
 $template = $formModalTpl->get_template('social/form_modals.tpl');
 $formModals = $formModalTpl->fetch($template);