diff --git a/main/calendar/agenda.php b/main/calendar/agenda.php
index a5be16136c..4b3c9a98ec 100755
--- a/main/calendar/agenda.php
+++ b/main/calendar/agenda.php
@@ -5,7 +5,7 @@
  * @package chamilo.calendar
  */
 
-use \ChamiloSession as Session;
+use ChamiloSession as Session;
 
 // use anonymous mode when accessing this course tool
 $use_anonymous = true;
@@ -63,7 +63,7 @@ $nameTools = get_lang('Agenda');
 Event::event_access_tool(TOOL_CALENDAR_EVENT);
 
 // permission stuff - also used by loading from global in agenda.inc.php
-$is_allowed_to_edit = api_is_allowed_to_edit(false, true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous());
+$is_allowed_to_edit = api_is_allowed_to_edit(false, true) || (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous());
 $agenda = new Agenda();
 $agenda->type = $type;
 $actions = $agenda->displayActions('calendar');
@@ -88,10 +88,10 @@ $agenda->type = $event_type;
 $message = null;
 $content = null;
 
-if (api_is_allowed_to_edit(false, true) OR
+if (api_is_allowed_to_edit(false, true) ||
     (api_get_course_setting('allow_user_edit_agenda') &&
     !api_is_anonymous() &&
-    api_is_allowed_to_session_edit(false, true)) OR
+    api_is_allowed_to_session_edit(false, true)) ||
     GroupManager::user_has_access(api_get_user_id(), $group_id,  GroupManager::GROUP_TOOL_CALENDAR) &&
     GroupManager::is_tutor_of_group(api_get_user_id(), $group_id)
 ) {
@@ -239,7 +239,7 @@ if (api_is_allowed_to_edit(false, true) OR
                 header("Location: $agendaUrl");
                 exit;
             } else {
-                $content = $form->return_form();
+                $content = $form->returnForm();
             }
             break;
         case 'importical':
diff --git a/main/calendar/agenda_list.php b/main/calendar/agenda_list.php
index ad10cebbec..6e0fbc443a 100755
--- a/main/calendar/agenda_list.php
+++ b/main/calendar/agenda_list.php
@@ -14,7 +14,7 @@ $interbreadcrumb[] = array(
 $agenda = new Agenda();
 $type = isset($_REQUEST['type']) ? $_REQUEST['type'] : null;
 $agenda->setType($type);
-$events = $agenda->get_events(
+$events = $agenda->getEvents(
     null,
     null,
     api_get_course_int_id(),
diff --git a/main/inc/ajax/agenda.ajax.php b/main/inc/ajax/agenda.ajax.php
index 658eddc8e0..55c07e5c64 100755
--- a/main/inc/ajax/agenda.ajax.php
+++ b/main/inc/ajax/agenda.ajax.php
@@ -101,7 +101,7 @@ switch ($action) {
         $start = isset($_REQUEST['start']) ? api_strtotime($_REQUEST['start']) : null;
         $end = isset($_REQUEST['end']) ? api_strtotime($_REQUEST['end']) : null;
 
-        $events = $agenda->get_events(
+        $events = $agenda->getEvents(
             $start,
             $end,
             api_get_course_int_id(),