diff --git a/main/calendar/agenda.php b/main/calendar/agenda.php
index 4b3c9a98ec..18555fe7aa 100755
--- a/main/calendar/agenda.php
+++ b/main/calendar/agenda.php
@@ -180,7 +180,7 @@ if (api_is_allowed_to_edit(false, true) ||
                 if (!empty($event['parent_event_id'])) {
                     $agenda->delete_event($eventId);
 
-                    $eventId = $agenda->add_event(
+                    $eventId = $agenda->addEvent(
                         $startDate,
                         $endDate,
                         $allDay,
diff --git a/main/cron/import_csv.php b/main/cron/import_csv.php
index c621849f41..500e4a770b 100755
--- a/main/cron/import_csv.php
+++ b/main/cron/import_csv.php
@@ -848,7 +848,7 @@ class ImportCsv
                     continue;
                 }
 
-                $eventId = $agenda->add_event(
+                $eventId = $agenda->addEvent(
                     $event['start'],
                     $event['end'],
                     false,
diff --git a/main/inc/ajax/agenda.ajax.php b/main/inc/ajax/agenda.ajax.php
index 55c07e5c64..e5ed559974 100755
--- a/main/inc/ajax/agenda.ajax.php
+++ b/main/inc/ajax/agenda.ajax.php
@@ -34,7 +34,7 @@ switch ($action) {
         $add_as_announcement = isset($_REQUEST['add_as_annonuncement']) ? $_REQUEST['add_as_annonuncement'] : null;
         $comment = isset($_REQUEST['comment']) ? $_REQUEST['comment'] : null;
         $userToSend = isset($_REQUEST['users_to_send']) ? $_REQUEST['users_to_send'] : array();
-        echo $agenda->add_event(
+        echo $agenda->addEvent(
             $_REQUEST['start'],
             $_REQUEST['end'],
             $_REQUEST['all_day'],
diff --git a/main/inc/lib/agenda.lib.php b/main/inc/lib/agenda.lib.php
index b70cdfb1e8..ddd59c2d22 100644
--- a/main/inc/lib/agenda.lib.php
+++ b/main/inc/lib/agenda.lib.php
@@ -119,7 +119,7 @@ class Agenda
      *
      * @return int
      */
-    public function add_event(
+    public function addEvent(
         $start,
         $end,
         $allDay,
@@ -418,7 +418,7 @@ class Agenda
                     for ($i = $origStartDate + 86400; $i <= $end; $i += 86400) {
                         $start = date('Y-m-d H:i:s', $i);
                         $repeatEnd = date('Y-m-d H:i:s', $i + $diff);
-                        $this->add_event(
+                        $this->addEvent(
                             $start,
                             $repeatEnd,
                             $allDay,
@@ -434,7 +434,7 @@ class Agenda
                     for ($i = $origStartDate + 604800; $i <= $end; $i += 604800) {
                         $start = date('Y-m-d H:i:s', $i);
                         $repeatEnd = date('Y-m-d H:i:s', $i + $diff);
-                        $this->add_event(
+                        $this->addEvent(
                             $start,
                             $repeatEnd,
                             $allDay,
@@ -451,7 +451,7 @@ class Agenda
                     while ($next_start <= $end) {
                         $start = date('Y-m-d H:i:s', $next_start);
                         $repeatEnd = date('Y-m-d H:i:s', $next_start + $diff);
-                        $this->add_event(
+                        $this->addEvent(
                             $start,
                             $repeatEnd,
                             $allDay,
@@ -475,7 +475,7 @@ class Agenda
                     while ($next_start <= $end) {
                         $start = date('Y-m-d H:i:s', $next_start);
                         $repeatEnd = date('Y-m-d H:i:s', $next_start + $diff);
-                        $this->add_event(
+                        $this->addEvent(
                             $start,
                             $repeatEnd,
                             $allDay,
@@ -895,7 +895,7 @@ class Agenda
     ) {
         switch ($this->type) {
             case 'admin':
-                $this->get_platform_events($start, $end);
+                $this->getPlatformEvents($start, $end);
                 break;
             case 'course':
                 $session_id = $this->sessionId;
@@ -912,10 +912,10 @@ class Agenda
             case 'personal':
             default:
                 // Getting personal events
-                $this->get_personal_events($start, $end);
+                $this->getPersonalEvents($start, $end);
 
                 // Getting platform/admin events
-                $this->get_platform_events($start, $end);
+                $this->getPlatformEvents($start, $end);
 
                 // Getting course events
                 $my_course_list = array();
@@ -1116,7 +1116,7 @@ class Agenda
      * @param int $end
      * @return array
      */
-    public function get_personal_events($start, $end)
+    public function getPersonalEvents($start, $end)
     {
         $start = intval($start);
         $end = intval($end);
@@ -1485,7 +1485,7 @@ class Agenda
      * @param int $end tms
      * @return array
      */
-    public function get_platform_events($start, $end)
+    public function getPlatformEvents($start, $end)
     {
         $start = intval($start);
         $end = intval($end);
@@ -2346,7 +2346,7 @@ class Agenda
                 $title = api_convert_encoding((string)$event->summary, $charset, 'UTF-8');
                 $description = api_convert_encoding((string)$event->description, $charset, 'UTF-8');
 
-                $id = $this->add_event(
+                $id = $this->addEvent(
                     $startDateTime,
                     $endDateTime,
                     'false',
diff --git a/main/inc/lib/system_announcements.lib.php b/main/inc/lib/system_announcements.lib.php
index 3ff0e234b6..ee4825c464 100755
--- a/main/inc/lib/system_announcements.lib.php
+++ b/main/inc/lib/system_announcements.lib.php
@@ -380,7 +380,7 @@ class SystemAnnouncementManager
 		if ($add_to_calendar) {
 			$agenda = new Agenda();
 			$agenda->setType('admin');
-			$id = $agenda->add_event(
+			$id = $agenda->addEvent(
 				$date_start,
 				$date_end,
 				false,
diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index bd00a331c0..60fc090263 100755
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -4192,7 +4192,7 @@ function updatePublicationAssignment($workId, $params, $courseInfo, $groupId)
         $agenda->type = 'course';
 
         if (empty($agendaId)) {
-            $agendaId = $agenda->add_event(
+            $agendaId = $agenda->addEvent(
                 $date,
                 $end_date,
                 'false',
diff --git a/plugin/bbb/listing.php b/plugin/bbb/listing.php
index 3b292a8e20..2da95abedd 100755
--- a/plugin/bbb/listing.php
+++ b/plugin/bbb/listing.php
@@ -32,7 +32,7 @@ if ($teacher) {
             $title = sprintf(get_lang('VideoConferenceXCourseX'), $id, $course_info['name']);
             $content = Display::url(get_lang('GoToTheVideoConference'), $_GET['url']);
 
-            $event_id = $agenda->add_event(
+            $event_id = $agenda->addEvent(
                 $_REQUEST['start'],
                 null,
                 'true',
diff --git a/plugin/openmeetings/listing.php b/plugin/openmeetings/listing.php
index ef148c2709..4b45086268 100755
--- a/plugin/openmeetings/listing.php
+++ b/plugin/openmeetings/listing.php
@@ -31,7 +31,7 @@ if ($teacher) {
             $title = sprintf(get_lang('VideoConferenceXCourseX'), $id, $course_info['name']);
             $content = Display::url(get_lang('GoToTheVideoConference'), $_GET['url']);
 
-            $event_id = $agenda->add_event(
+            $event_id = $agenda->addEvent(
                 $_REQUEST['start'],
                 null,
                 'true',