diff --git a/main/inc/lib/AnnouncementManager.php b/main/inc/lib/AnnouncementManager.php
index 20549d9cd7..9fcee6d522 100755
--- a/main/inc/lib/AnnouncementManager.php
+++ b/main/inc/lib/AnnouncementManager.php
@@ -60,7 +60,7 @@ class AnnouncementManager
     ) {
         $readerInfo = api_get_user_info($userId);
         $courseInfo = api_get_course_info($courseCode);
-        $teacherList = CourseManager::get_teacher_list_from_course_code_to_string(
+        $teacherList = CourseManager::getTeacherListFromCourseCodeToString(
             $courseInfo['code']
         );
 
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 2380ad6aee..e44a380362 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -2301,12 +2301,12 @@ function api_get_session_name($session_id = 0)
 
 /**
  * Gets the session info by id
- * @param int       Session ID
+ * @param int $id       Session ID
  * @return array    information of the session
  */
-function api_get_session_info($session_id)
+function api_get_session_info($id)
 {
-    return SessionManager::fetch($session_id);
+    return SessionManager::fetch($id);
 }
 
 /**
diff --git a/main/inc/lib/pdf.lib.php b/main/inc/lib/pdf.lib.php
index e912b21abe..246f2071cb 100755
--- a/main/inc/lib/pdf.lib.php
+++ b/main/inc/lib/pdf.lib.php
@@ -120,7 +120,7 @@ class PDF
 
                 );
             } else {
-                $teacher_list = CourseManager::get_teacher_list_from_course_code_to_string(
+                $teacher_list = CourseManager::getTeacherListFromCourseCodeToString(
                     $this->params['course_code']
                 );
             }
diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php
index d8a7a4146f..bd3a22a100 100755
--- a/main/inc/lib/social.lib.php
+++ b/main/inc/lib/social.lib.php
@@ -1045,12 +1045,10 @@ class SocialManager extends UserManager
                     'new-message.png',
                     $sendMessageText
                 );
-                $sendMessageUrl = api_get_path(WEB_AJAX_PATH)
-                    . 'user_manager.ajax.php?'
-                    . http_build_query([
-                        'a' => 'get_user_popup',
-                        'user_id' => $user_id,
-                    ]);
+                $sendMessageUrl = api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?'. http_build_query([
+                    'a' => 'get_user_popup',
+                    'user_id' => $user_id,
+                ]);
 
                 $links .= '<li>';
                 $links .= Display::url(
diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php
index e699dcc605..a18bd2b34c 100755
--- a/main/inc/lib/userportal.lib.php
+++ b/main/inc/lib/userportal.lib.php
@@ -608,7 +608,7 @@ class IndexManager
                             $course_details[] = $course['visual_code'];
                         }
                         if (api_get_setting('display_teacher_in_courselist') === 'true') {
-                            $course_details[] = CourseManager::get_teacher_list_from_course_code_to_string($course['code']);
+                            $course_details[] = CourseManager::getTeacherListFromCourseCodeToString($course['code']);
                         }
                         if (api_get_setting('show_different_course_language') === 'true' &&
                             $course['course_language'] != api_get_setting('platformLanguage')
diff --git a/main/inc/lib/webservices/Rest.php b/main/inc/lib/webservices/Rest.php
index b931aacd18..4c20162a55 100644
--- a/main/inc/lib/webservices/Rest.php
+++ b/main/inc/lib/webservices/Rest.php
@@ -203,7 +203,7 @@ class Rest extends WebService
         foreach ($courses as $courseId) {
             /** @var Course $course */
             $course = Database::getManager()->find('ChamiloCoreBundle:Course', $courseId['real_id']);
-            $teachers = CourseManager::get_teacher_list_from_course_code_to_string($course->getCode());
+            $teachers = CourseManager::getTeacherListFromCourseCodeToString($course->getCode());
 
             $data[] = [
                 'id' => $course->getId(),
@@ -224,7 +224,7 @@ class Rest extends WebService
      */
     public function getCourseInfo()
     {
-        $teachers = CourseManager::get_teacher_list_from_course_code_to_string($this->course->getCode());
+        $teachers = CourseManager::getTeacherListFromCourseCodeToString($this->course->getCode());
         $tools = CourseHome::get_tools_category(
             TOOL_STUDENT_VIEW,
             $this->course->getId(),
@@ -239,7 +239,7 @@ class Rest extends WebService
             'urlPicture' => $this->course->getPicturePath(true),
             'teachers' => $teachers,
             'tools' => array_map(
-                function($tool) {
+                function ($tool) {
                     return ['type' => $tool['name']];
                 },
                 $tools
diff --git a/main/social/search.php b/main/social/search.php
index 093dd3615b..30327c41ab 100755
--- a/main/social/search.php
+++ b/main/social/search.php
@@ -94,12 +94,10 @@ if ($query != '' || ($query_vars['search_type'] == '1' && count($query_vars) > 2
                              <em class="fa fa-user"></em> '.get_lang('SendInvitation').'</a>';
             }
 
-            $sendMessageUrl = api_get_path(WEB_AJAX_PATH)
-                . 'user_manager.ajax.php?'
-                . http_build_query([
-                    'a' => 'get_user_popup',
-                    'user_id' => $user_info['user_id']
-                ]);
+            $sendMessageUrl = api_get_path(WEB_AJAX_PATH). 'user_manager.ajax.php?'.http_build_query([
+                'a' => 'get_user_popup',
+                'user_id' => $user_info['user_id']
+            ]);
             $sendMessage = Display::toolbarButton(
                 get_lang('SendMessage'),
                 $sendMessageUrl,
diff --git a/main/template/default/user_portal/classic_session.tpl b/main/template/default/user_portal/classic_session.tpl
index 0d1b397505..b45f4b8796 100644
--- a/main/template/default/user_portal/classic_session.tpl
+++ b/main/template/default/user_portal/classic_session.tpl
@@ -74,7 +74,7 @@
                                                 <img src="{{ 'teacher.png'|icon(16) }}" width="16" height="16">
                                                 {% for coach in item.coaches %}
                                                     {{ loop.index > 1 ? ' | ' }}
-                                                    <a href="{{ _p.web_ajax ~ 'user_manager.ajax.php?' ~ {'a': 'get_user_popup', 'user_id': coach.user_id}|url_encode() }}"
+                                                    <a href="{{ _p.web_ajax ~ 'user_manager.ajax.php?' ~ {'a': 'get_user_popup', 'user_id': coach.user_id, 'session_id': row.id, 'course_id': item.real_id }|url_encode() }}"
                                                        data-title="{{ coach.full_name }}" class="ajax">
                                                         {{ coach.firstname }}, {{ coach.lastname }}
                                                     </a>
diff --git a/main/tracking/courseLog.php b/main/tracking/courseLog.php
index 57afccb3a5..a88a5cc3ed 100755
--- a/main/tracking/courseLog.php
+++ b/main/tracking/courseLog.php
@@ -309,7 +309,7 @@ if ($session_id) {
         ICON_SIZE_SMALL
     ).' '.$courseInfo['name'];
 }
-$teacherList = CourseManager::get_teacher_list_from_course_code_to_string(
+$teacherList = CourseManager::getTeacherListFromCourseCodeToString(
     $courseInfo['code'],
     ',',
     false,
diff --git a/main/tracking/total_time.php b/main/tracking/total_time.php
index d5fb23b6df..fb69c126a6 100644
--- a/main/tracking/total_time.php
+++ b/main/tracking/total_time.php
@@ -230,7 +230,7 @@ if ($session_id) {
         ICON_SIZE_SMALL
     ).' '.$courseInfo['name'];
 }
-$teacherList = CourseManager::get_teacher_list_from_course_code_to_string(
+$teacherList = CourseManager::getTeacherListFromCourseCodeToString(
     $courseInfo['code'],
     ',',
     false,
diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index 5d8b7eb573..3227180d47 100755
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -5328,7 +5328,7 @@ function exportAllStudentWorkFromPublication(
 
     $courseCode = $courseInfo['code'];
     $header = get_lang('Course').': '.$courseInfo['title'];
-    $teachers = CourseManager::get_teacher_list_from_course_code_to_string(
+    $teachers = CourseManager::getTeacherListFromCourseCodeToString(
         $courseCode
     );