diff --git a/lib/datalib.php b/lib/datalib.php
index 5c3983ab1c4..412dfa375b7 100644
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -22,7 +22,6 @@
  * - moodlelib.php - general-purpose Moodle functions
  *
  * @package    core
- * @subpackage lib
  * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -1648,9 +1647,11 @@ function coursemodule_visible_for_user($cm, $userid=0) {
  * than web server hits, and provide a way to easily reconstruct what
  * any particular student has been doing.
  *
- * @global object $DB
- * @global object $CFG
- * @global object $USER
+ * @package core
+ * @category log
+ * @global moodle_database $DB
+ * @global stdClass $CFG
+ * @global stdClass $USER
  * @uses SITEID
  * @uses DEBUG_DEVELOPER
  * @uses DEBUG_ALL
@@ -1745,9 +1746,11 @@ function add_to_log($courseid, $module, $action, $url='', $info='', $cm=0, $user
 /**
  * Store user last access times - called when use enters a course or site
  *
- * @global object $USER
- * @global object $CFG
- * @global object $DB
+ * @package core
+ * @category log
+ * @global stdClass $USER
+ * @global stdClass $CFG
+ * @global moodle_database $DB
  * @uses LASTACCESS_UPDATE_SECS
  * @uses SITEID
  * @param int $courseid  empty courseid means site
@@ -1815,14 +1818,16 @@ function user_accesstime_log($courseid=0) {
 /**
  * Select all log records based on SQL criteria
  *
- * @global object $DB
+ * @package core
+ * @category log
+ * @global moodle_database $DB
  * @param string $select SQL select criteria
  * @param array $params named sql type params
  * @param string $order SQL order by clause to sort the records returned
  * @param string $limitfrom return a subset of records, starting at this point (optional, required if $limitnum is set)
  * @param int $limitnum return a subset comprising this many records (optional, required if $limitfrom is set)
  * @param int $totalcount Passed in by reference.
- * @return moodle_recordset instance
+ * @return array
  */
 function get_logs($select, array $params=null, $order='l.time DESC', $limitfrom='', $limitnum='', &$totalcount) {
     global $DB;
@@ -1857,12 +1862,14 @@ function get_logs($select, array $params=null, $order='l.time DESC', $limitfrom=
 /**
  * Select all log records for a given course and user
  *
- * @global object $DB
+ * @package core
+ * @category log
+ * @global moodle_database $DB
  * @uses DAYSECS
  * @param int $userid The id of the user as found in the 'user' table.
  * @param int $courseid The id of the course as found in the 'course' table.
  * @param string $coursestart unix timestamp representing course start date and time.
- * @return moodle_recordset instance
+ * @return array
  */
 function get_logs_usercourse($userid, $courseid, $coursestart) {
     global $DB;
@@ -1887,12 +1894,14 @@ function get_logs_usercourse($userid, $courseid, $coursestart) {
 /**
  * Select all log records for a given course, user, and day
  *
- * @global object $DB
+ * @package core
+ * @category log
+ * @global moodle_database $DB
  * @uses HOURSECS
  * @param int $userid The id of the user as found in the 'user' table.
  * @param int $courseid The id of the course as found in the 'course' table.
  * @param string $daystart unix timestamp of the start of the day for which the logs needs to be retrived
- * @return moodle_recordset instance
+ * @return array
  */
 function get_logs_userday($userid, $courseid, $daystart) {
     global $DB;
@@ -1921,7 +1930,7 @@ function get_logs_userday($userid, $courseid, $daystart) {
  * number of accounts.  For non-admins, only the attempts on the given user
  * are shown.
  *
- * @global object $DB
+ * @global moodle_database $DB
  * @uses CONTEXT_SYSTEM
  * @param string $mode Either 'admin' or 'everybody'
  * @param string $username The username we are searching for
diff --git a/mod/assignment/db/log.php b/mod/assignment/db/log.php
index 09e6c567cb1..62ca1fa5742 100644
--- a/mod/assignment/db/log.php
+++ b/mod/assignment/db/log.php
@@ -18,8 +18,8 @@
 /**
  * Definition of log events
  *
- * @package    mod
- * @subpackage assignment
+ * @package    mod_assignment
+ * @category   log
  * @copyright  2010 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/chat/db/log.php b/mod/chat/db/log.php
index 4355e307581..275f5f71fec 100644
--- a/mod/chat/db/log.php
+++ b/mod/chat/db/log.php
@@ -18,8 +18,8 @@
 /**
  * Definition of log events
  *
- * @package    mod
- * @subpackage chat
+ * @package    mod_chat
+ * @category   log
  * @copyright  2010 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/choice/db/log.php b/mod/choice/db/log.php
index e048776742a..3fd3ef97d81 100644
--- a/mod/choice/db/log.php
+++ b/mod/choice/db/log.php
@@ -18,8 +18,8 @@
 /**
  * Definition of log events
  *
- * @package    mod
- * @subpackage choice
+ * @package    mod_choice
+ * @category   log
  * @copyright  2010 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/data/db/log.php b/mod/data/db/log.php
index 3f32f537234..37235c2dcf1 100644
--- a/mod/data/db/log.php
+++ b/mod/data/db/log.php
@@ -18,8 +18,8 @@
 /**
  * Definition of log events
  *
- * @package    mod
- * @subpackage data
+ * @package    mod_data
+ * @category   log
  * @copyright  2010 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/feedback/db/log.php b/mod/feedback/db/log.php
index a27ce3e7847..1b97e030632 100644
--- a/mod/feedback/db/log.php
+++ b/mod/feedback/db/log.php
@@ -17,8 +17,8 @@
 /**
  * Definition of log events
  *
- * @package    mod
- * @subpackage feedback
+ * @package    mod_feedback
+ * @category   log
  * @copyright  2010 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/folder/db/log.php b/mod/folder/db/log.php
index 37b60174def..6a22bcf486a 100644
--- a/mod/folder/db/log.php
+++ b/mod/folder/db/log.php
@@ -18,8 +18,8 @@
 /**
  * Definition of log events
  *
- * @package    mod
- * @subpackage folder
+ * @package    mod_folder
+ * @category   log
  * @copyright  2010 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/forum/db/log.php b/mod/forum/db/log.php
index b39f898b65b..22ae66c7a0b 100644
--- a/mod/forum/db/log.php
+++ b/mod/forum/db/log.php
@@ -18,8 +18,8 @@
 /**
  * Definition of log events
  *
- * @package    mod
- * @subpackage forum
+ * @package    mod_forum
+ * @category   log
  * @copyright  2010 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/glossary/db/log.php b/mod/glossary/db/log.php
index 19d77d588dd..8f802599bdd 100644
--- a/mod/glossary/db/log.php
+++ b/mod/glossary/db/log.php
@@ -18,8 +18,8 @@
 /**
  * Definition of log events
  *
- * @package    mod
- * @subpackage glossary
+ * @package    mod_glossary
+ * @category   log
  * @copyright  2010 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/imscp/db/log.php b/mod/imscp/db/log.php
index 599b40de0b7..5c372790d26 100644
--- a/mod/imscp/db/log.php
+++ b/mod/imscp/db/log.php
@@ -18,8 +18,8 @@
 /**
  * Definition of log events
  *
- * @package    mod
- * @subpackage imscp
+ * @package    mod_imscp
+ * @category   log
  * @copyright  2010 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/label/db/log.php b/mod/label/db/log.php
index bc98f862394..768cabc0b82 100644
--- a/mod/label/db/log.php
+++ b/mod/label/db/log.php
@@ -18,8 +18,8 @@
 /**
  * Definition of log events
  *
- * @package    mod
- * @subpackage label
+ * @package    mod_label
+ * @category   log
  * @copyright  2010 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/lesson/db/log.php b/mod/lesson/db/log.php
index c77ccebbc31..90ace43fb7d 100644
--- a/mod/lesson/db/log.php
+++ b/mod/lesson/db/log.php
@@ -18,8 +18,8 @@
 /**
  * Definition of log events
  *
- * @package    mod
- * @subpackage lesson
+ * @package    mod_lesson
+ * @category   log
  * @copyright  2010 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/lti/db/log.php b/mod/lti/db/log.php
index e043978211f..f00306e6049 100644
--- a/mod/lti/db/log.php
+++ b/mod/lti/db/log.php
@@ -17,8 +17,8 @@
 /**
  * LTI web service endpoints
  *
- * @package    mod
- * @subpackage lti
+ * @package    mod_lti
+ * @category   log
  * @copyright  Copyright (c) 2011 Moodlerooms Inc. (http://www.moodlerooms.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @author     Chris Scribner
diff --git a/mod/page/db/log.php b/mod/page/db/log.php
index e321dc23d91..915a5a19851 100644
--- a/mod/page/db/log.php
+++ b/mod/page/db/log.php
@@ -18,8 +18,8 @@
 /**
  * Definition of log events
  *
- * @package    mod
- * @subpackage page
+ * @package    mod_page
+ * @category   log
  * @copyright  2010 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/quiz/db/log.php b/mod/quiz/db/log.php
index c5a31e72529..f86c8351ecd 100644
--- a/mod/quiz/db/log.php
+++ b/mod/quiz/db/log.php
@@ -17,8 +17,8 @@
 /**
  * Definition of log events for the quiz module.
  *
- * @package    mod
- * @subpackage quiz
+ * @package    mod_quiz
+ * @category   log
  * @copyright  2010 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/resource/db/log.php b/mod/resource/db/log.php
index 687bc0c92e1..4fd4d228f98 100644
--- a/mod/resource/db/log.php
+++ b/mod/resource/db/log.php
@@ -18,8 +18,8 @@
 /**
  * Definition of log events
  *
- * @package    mod
- * @subpackage resource
+ * @package    mod_resource
+ * @category   log
  * @copyright  2010 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/scorm/db/log.php b/mod/scorm/db/log.php
index 2448fb03b1a..6e8a014d40f 100644
--- a/mod/scorm/db/log.php
+++ b/mod/scorm/db/log.php
@@ -17,8 +17,8 @@
 /**
  * Definition of log events
  *
- * @package    mod
- * @subpackage scorm
+ * @package    mod_scorm
+ * @category   log
  * @copyright  2010 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/survey/db/log.php b/mod/survey/db/log.php
index 293ffe08841..c0a791772ec 100644
--- a/mod/survey/db/log.php
+++ b/mod/survey/db/log.php
@@ -18,8 +18,8 @@
 /**
  * Definition of log events
  *
- * @package    mod
- * @subpackage survey
+ * @package    mod_survey
+ * @category   log
  * @copyright  2010 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/url/db/log.php b/mod/url/db/log.php
index 9edde726f04..a393eb933b5 100644
--- a/mod/url/db/log.php
+++ b/mod/url/db/log.php
@@ -18,8 +18,8 @@
 /**
  * Definition of log events
  *
- * @package    mod
- * @subpackage url
+ * @package    mod_url
+ * @category   log
  * @copyright  2010 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/mod/workshop/db/log.php b/mod/workshop/db/log.php
index 82627ed4486..19d04e49a62 100644
--- a/mod/workshop/db/log.php
+++ b/mod/workshop/db/log.php
@@ -18,8 +18,8 @@
 /**
  * Definition of log events
  *
- * @package    mod
- * @subpackage workshop
+ * @package    mod_workshop
+ * @category   log
  * @copyright  2010 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/report/log/db/access.php b/report/log/db/access.php
index f4073e6f388..9ef82f2a709 100644
--- a/report/log/db/access.php
+++ b/report/log/db/access.php
@@ -19,8 +19,7 @@
  * 
  * Defines capablities related to logs
  *
- * @package    report
- * @subpackage log
+ * @package    report_log
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/report/log/db/install.php b/report/log/db/install.php
index 04d1679c4a7..14c23862fa3 100644
--- a/report/log/db/install.php
+++ b/report/log/db/install.php
@@ -19,8 +19,7 @@
  * 
  * Contains code that are run during the installation of report/logs
  * 
- * @package    report
- * @subpackage log
+ * @package    report_log
  * @copyright  2011 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -30,7 +29,7 @@ defined('MOODLE_INTERNAL') || die;
 /**
  * Contains codes to be run during installation of report/logs
  * 
- * @global object $DB
+ * @global moodle_database $DB
  * @return void
  */
 function xmldb_report_log_install() {
diff --git a/report/log/graph.php b/report/log/graph.php
index 5a5754f27e0..44faa90ad60 100644
--- a/report/log/graph.php
+++ b/report/log/graph.php
@@ -19,8 +19,7 @@
  *
  * Generates an image representing the log data in a graphical manner for a user.
  * 
- * @package    report
- * @subpackage log
+ * @package    report_log
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/report/log/index.php b/report/log/index.php
index 08434eb5cc9..c0a94fe1114 100644
--- a/report/log/index.php
+++ b/report/log/index.php
@@ -17,8 +17,7 @@
 /**
  * Displays different views of the logs.
  *
- * @package    report
- * @subpackage log
+ * @package    report_log
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/report/log/lang/en/report_log.php b/report/log/lang/en/report_log.php
index f5b8ece4ea3..c2ceda0945e 100644
--- a/report/log/lang/en/report_log.php
+++ b/report/log/lang/en/report_log.php
@@ -19,8 +19,7 @@
  * 
  * Language strings to be used by report/logs
  *
- * @package    report
- * @subpackage log
+ * @package    report_log
  * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/report/log/lib.php b/report/log/lib.php
index cf9f08d6f58..58acedf1098 100644
--- a/report/log/lib.php
+++ b/report/log/lib.php
@@ -19,8 +19,7 @@
  *
  * Defines the APIs used by log reports
  * 
- * @package    report
- * @subpackage log
+ * @package    report_log
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -64,8 +63,8 @@ function report_log_extend_navigation_user($navigation, $user, $course) {
 /**
  * Is current user allowed to access this report
  *
- * @private defined in lib.php for performance reasons
- *
+ * @access private defined in lib.php for performance reasons
+ * @global stdClass $USER
  * @param stdClass $user
  * @param stdClass $course
  * @return array with two elements $all, $today
@@ -119,6 +118,7 @@ function report_log_extend_navigation_module($navigation, $cm) {
 
 /**
  * Return a list of page types
+ *
  * @param string $pagetype current page type
  * @param stdClass $parentcontext Block's parent context
  * @param stdClass $currentcontext Current context of block
diff --git a/report/log/locallib.php b/report/log/locallib.php
index 656b38ef5e0..3102d503a66 100644
--- a/report/log/locallib.php
+++ b/report/log/locallib.php
@@ -19,8 +19,7 @@
  *
  * This files lists the functions that are used during the log report generation.
  *
- * @package    report
- * @subpackage log
+ * @package    report_log
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -36,8 +35,8 @@ require_once(dirname(__FILE__).'/lib.php');
 /**
  * This function is used to generate and display the log activity graph
  *
- * @global object $CFG
- * @param  object $course course instance
+ * @global stdClass $CFG
+ * @param  stdClass $course course instance
  * @param  int    $userid id of the user whose logs are needed
  * @param  string $type type of logs graph needed (usercourse.png/userday.png)
  * @return void
@@ -55,27 +54,27 @@ function report_log_print_graph($course, $userid, $type, $date=0) {
 /**
  * This function is used to generate and display Mnet selector form
  *
- * @global object $USER
- * @global object $CFG
- * @global object $SITE
- * @global object $DB
- * @global object $OUTPUT
- * @global object $SESSION
+ * @global stdClass $USER
+ * @global stdClass $CFG
+ * @global stdClass $SITE
+ * @global moodle_database $DB
+ * @global core_renderer $OUTPUT
+ * @global stdClass $SESSION
  * @uses CONTEXT_SYSTEM
  * @uses COURSE_MAX_COURSES_PER_DROPDOWN
  * @uses CONTEXT_COURSE
  * @uses SEPARATEGROUPS
- * @param  int    $hostid host id
- * @param  object $course course instance
- * @param  int    $selecteduser id of the selected user
- * @param  string $selecteddate Date selected
- * @param  string $modname course_module->id
- * @param  string $modid number or 'site_errors'
- * @param  string $modaction an action as recorded in the logs
- * @param  int    $selectedgroup Group to display
- * @param  int    $showcourses whether to show courses if we're over our limit.
- * @param  int    $showusers whether to show users if we're over our limit.
- * @param  string $logformat Format of the logs (downloadascsv, showashtml, downloadasods, downloadasexcel)
+ * @param  int      $hostid host id
+ * @param  stdClass $course course instance
+ * @param  int      $selecteduser id of the selected user
+ * @param  string   $selecteddate Date selected
+ * @param  string   $modname course_module->id
+ * @param  string   $modid number or 'site_errors'
+ * @param  string   $modaction an action as recorded in the logs
+ * @param  int      $selectedgroup Group to display
+ * @param  int      $showcourses whether to show courses if we're over our limit.
+ * @param  int      $showusers whether to show users if we're over our limit.
+ * @param  string   $logformat Format of the logs (downloadascsv, showashtml, downloadasods, downloadasexcel)
  * @return void
  */
 function report_log_print_mnet_selector_form($hostid, $course, $selecteduser=0, $selecteddate='today',
@@ -365,25 +364,25 @@ function report_log_print_mnet_selector_form($hostid, $course, $selecteduser=0,
 /**
  * This function is used to generate and display selector form
  *
- * @global object $USER
- * @global object $CFG
- * @global object $DB
- * @global object $OUTPUT
- * @global object $SESSION
+ * @global stdClass $USER
+ * @global stdClass $CFG
+ * @global moodle_database $DB
+ * @global core_renderer $OUTPUT
+ * @global stdClass $SESSION
  * @uses CONTEXT_SYSTEM
  * @uses COURSE_MAX_COURSES_PER_DROPDOWN
  * @uses CONTEXT_COURSE
  * @uses SEPARATEGROUPS
- * @param  object $course course instance
- * @param  int    $selecteduser id of the selected user
- * @param  string $selecteddate Date selected
- * @param  string $modname course_module->id
- * @param  string $modid number or 'site_errors'
- * @param  string $modaction an action as recorded in the logs
- * @param  int    $selectedgroup Group to display
- * @param  int    $showcourses whether to show courses if we're over our limit.
- * @param  int    $showusers whether to show users if we're over our limit.
- * @param  string $logformat Format of the logs (downloadascsv, showashtml, downloadasods, downloadasexcel)
+ * @param  stdClass $course course instance
+ * @param  int      $selecteduser id of the selected user
+ * @param  string   $selecteddate Date selected
+ * @param  string   $modname course_module->id
+ * @param  string   $modid number or 'site_errors'
+ * @param  string   $modaction an action as recorded in the logs
+ * @param  int      $selectedgroup Group to display
+ * @param  int      $showcourses whether to show courses if we're over our limit.
+ * @param  int      $showusers whether to show users if we're over our limit.
+ * @param  string   $logformat Format of the logs (downloadascsv, showashtml, downloadasods, downloadasexcel)
  * @return void
  */
 function report_log_print_selector_form($course, $selecteduser=0, $selecteddate='today',
diff --git a/report/log/settings.php b/report/log/settings.php
index 4e429e2d4f0..f202b310570 100644
--- a/report/log/settings.php
+++ b/report/log/settings.php
@@ -19,8 +19,7 @@
  *
  * Contains settings used by logs report.
  * 
- * @package    report
- * @subpackage log
+ * @package    report_log
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/report/log/user.php b/report/log/user.php
index 0a51e731134..32ed5821233 100644
--- a/report/log/user.php
+++ b/report/log/user.php
@@ -17,8 +17,7 @@
 /**
  * Display user activity reports for a course (totals)
  *
- * @package    report
- * @subpackage log
+ * @package    report_log
  * @copyright  1999 onwards Martin Dougiamas  http://dougiamas.com
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/report/log/version.php b/report/log/version.php
index 5176abf2740..8ba3d8a226a 100644
--- a/report/log/version.php
+++ b/report/log/version.php
@@ -19,8 +19,7 @@
  *
  * This File contains information about the current version of report/logs
  *  
- * @package    report
- * @subpackage log
+ * @package    report_log
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/report/loglive/db/access.php b/report/loglive/db/access.php
index bd88770414d..e1b75c07f2d 100644
--- a/report/loglive/db/access.php
+++ b/report/loglive/db/access.php
@@ -19,8 +19,7 @@
  *
  * This files lists capabilites related to report_logline
  * 
- * @package    report
- * @subpackage loglive
+ * @package    report_loglive
  * @copyright  2011 Petr Skoda
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/report/loglive/index.php b/report/loglive/index.php
index 21180a4df57..c82f766d126 100644
--- a/report/loglive/index.php
+++ b/report/loglive/index.php
@@ -19,8 +19,7 @@
  *
  * This file generates live view of recent logs.
  * 
- * @package    report
- * @subpackage loglive
+ * @package    report_loglive
  * @copyright  2011 Petr Skoda
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/report/loglive/lang/en/report_loglive.php b/report/loglive/lang/en/report_loglive.php
index 39f689f61d1..2f90ae17e99 100644
--- a/report/loglive/lang/en/report_loglive.php
+++ b/report/loglive/lang/en/report_loglive.php
@@ -19,8 +19,7 @@
  *
  * Language strings used by report_loglive
  * 
- * @package    report
- * @subpackage loglive
+ * @package    report_loglive
  * @copyright  2011 Petr Skoda
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/report/loglive/lib.php b/report/loglive/lib.php
index 1b3a3328fa6..b233d266e38 100644
--- a/report/loglive/lib.php
+++ b/report/loglive/lib.php
@@ -19,8 +19,7 @@
  *
  * NOTE: page type not included because there can not be any blocks in popups
  *
- * @package    report
- * @subpackage loglive
+ * @package    report_loglive
  * @copyright  2011 Petr Skoda
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -30,6 +29,8 @@ defined('MOODLE_INTERNAL') || die;
 /**
  * This function extends the navigation with the report items
  *
+ * @global stdClass $CFG
+ * @global core_renderer $OUTPUT
  * @param navigation_node $navigation The navigation node to extend
  * @param stdClass        $course     The course to object for the report
  * @param stdClass        $context    The context of the course
diff --git a/report/loglive/settings.php b/report/loglive/settings.php
index a5365c44ef8..f94510bdb89 100644
--- a/report/loglive/settings.php
+++ b/report/loglive/settings.php
@@ -19,8 +19,7 @@
  *
  * This file contains links and settings used by report_loglive
  * 
- * @package    report
- * @subpackage loglive
+ * @package    report_loglive
  * @copyright  2011 Petr Skoda
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/report/loglive/version.php b/report/loglive/version.php
index c60a235eab3..a2d255c89cb 100644
--- a/report/loglive/version.php
+++ b/report/loglive/version.php
@@ -19,8 +19,7 @@
  *
  * This file contains version information about report_loglive
  *  
- * @package    report
- * @subpackage loglive
+ * @package    report_loglive
  * @copyright  2011 Petr Skoda
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */