diff --git a/admin/category.php b/admin/category.php
index 1d68207221c..fdda580fd90 100644
--- a/admin/category.php
+++ b/admin/category.php
@@ -17,7 +17,7 @@
 /**
  * This file is used to display a categories sub categories, external pages, and settings.
  *
- * @since      2.3
+ * @since      Moodle 2.3
  * @package    admin
  * @copyright  2011 Sam Hemelryk
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/admin/lib.php b/admin/lib.php
index fbb9997d5ce..c9ddefa71d3 100644
--- a/admin/lib.php
+++ b/admin/lib.php
@@ -18,7 +18,7 @@
 /**
  * This file contains functions used by the admin pages
  *
- * @since 2.1
+ * @since Moodle 2.1
  * @package admin
  * @copyright 2011 Andrew Davis
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/auth/mnet/db/mnet.php b/auth/mnet/db/mnet.php
index 8a371d3ef75..262e6b766be 100644
--- a/auth/mnet/db/mnet.php
+++ b/auth/mnet/db/mnet.php
@@ -17,7 +17,7 @@
 /**
  * This file contains the mnet services for the mnet authentication plugin
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package auth_mnet
  * @copyright 2010 Penny Leach
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/backup/util/helper/backup_general_helper.class.php b/backup/util/helper/backup_general_helper.class.php
index 645f2e93e28..e84d2f6f8ac 100644
--- a/backup/util/helper/backup_general_helper.class.php
+++ b/backup/util/helper/backup_general_helper.class.php
@@ -232,7 +232,7 @@ abstract class backup_general_helper extends backup_helper {
      *
      * @param string $filepath absolute path to the MBZ file.
      * @return stdClass containing information.
-     * @since 2.4
+     * @since Moodle 2.4
      */
     public static function get_backup_information_from_mbz($filepath) {
         global $CFG;
diff --git a/blocks/community/db/upgrade.php b/blocks/community/db/upgrade.php
index 421b1f65615..4216d29acb0 100644
--- a/blocks/community/db/upgrade.php
+++ b/blocks/community/db/upgrade.php
@@ -31,7 +31,7 @@
  * Please do not forget to use upgrade_set_timeout()
  * before any action that may take longer time to finish.
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package block_community
  * @copyright 2010 Jerome Mouneyrac
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/completionstatus/db/upgrade.php b/blocks/completionstatus/db/upgrade.php
index 401040ad5f6..460c565fe2c 100644
--- a/blocks/completionstatus/db/upgrade.php
+++ b/blocks/completionstatus/db/upgrade.php
@@ -31,7 +31,7 @@
  * Please do not forget to use upgrade_set_timeout()
  * before any action that may take longer time to finish.
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package block_completionstatus
  * @copyright 2012 Mark Nelson <markn@moodle.com>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/course_summary/db/upgrade.php b/blocks/course_summary/db/upgrade.php
index 6e2b6f6266a..e4a6b9f7116 100644
--- a/blocks/course_summary/db/upgrade.php
+++ b/blocks/course_summary/db/upgrade.php
@@ -31,7 +31,7 @@
  * Please do not forget to use upgrade_set_timeout()
  * before any action that may take longer time to finish.
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package block_course_summary
  * @copyright 2012 Mark Nelson <markn@moodle.com>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/html/db/upgrade.php b/blocks/html/db/upgrade.php
index cef37a7e066..c938df70aaa 100644
--- a/blocks/html/db/upgrade.php
+++ b/blocks/html/db/upgrade.php
@@ -17,7 +17,7 @@
 /**
  * This file keeps track of upgrades to the html block
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package block_html
  * @copyright 2010 Dongsheng Cai
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/navigation/block_navigation.php b/blocks/navigation/block_navigation.php
index f152729b240..17a25093bde 100644
--- a/blocks/navigation/block_navigation.php
+++ b/blocks/navigation/block_navigation.php
@@ -18,7 +18,7 @@
  * This file contains classes used to manage the navigation structures in Moodle
  * and was introduced as part of the changes occuring in Moodle 2.0
  *
- * @since     2.0
+ * @since     Moodle 2.0
  * @package   block_navigation
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/navigation/db/upgrade.php b/blocks/navigation/db/upgrade.php
index a1a8367310c..a1497bfca61 100644
--- a/blocks/navigation/db/upgrade.php
+++ b/blocks/navigation/db/upgrade.php
@@ -31,7 +31,7 @@
  * Please do not forget to use upgrade_set_timeout()
  * before any action that may take longer time to finish.
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package block_navigation
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/navigation/edit_form.php b/blocks/navigation/edit_form.php
index 3134e59f23e..9db482af6f9 100644
--- a/blocks/navigation/edit_form.php
+++ b/blocks/navigation/edit_form.php
@@ -17,7 +17,7 @@
 /**
  * Form for editing global navigation instances.
  *
- * @since     2.0
+ * @since     Moodle 2.0
  * @package   block_navigation
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/navigation/lang/en/block_navigation.php b/blocks/navigation/lang/en/block_navigation.php
index 432b0edf38b..0b8e6dc319c 100644
--- a/blocks/navigation/lang/en/block_navigation.php
+++ b/blocks/navigation/lang/en/block_navigation.php
@@ -18,7 +18,7 @@
 /**
  * This file contains language strings used in the global navigation block
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package block_navigation
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/navigation/renderer.php b/blocks/navigation/renderer.php
index 8387e082644..c92ef41f0a1 100644
--- a/blocks/navigation/renderer.php
+++ b/blocks/navigation/renderer.php
@@ -17,7 +17,7 @@
 /**
  * Outputs the navigation tree.
  *
- * @since     2.0
+ * @since     Moodle 2.0
  * @package   block_navigation
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/section_links/db/upgrade.php b/blocks/section_links/db/upgrade.php
index 42a472c619f..79f928dd4fd 100644
--- a/blocks/section_links/db/upgrade.php
+++ b/blocks/section_links/db/upgrade.php
@@ -31,7 +31,7 @@
  * Please do not forget to use upgrade_set_timeout()
  * before any action that may take longer time to finish.
  *
- * @since 2.5
+ * @since Moodle 2.5
  * @package block_section_links
  * @copyright 2013 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/section_links/renderer.php b/blocks/section_links/renderer.php
index 9fb281fa6a2..338855b9238 100644
--- a/blocks/section_links/renderer.php
+++ b/blocks/section_links/renderer.php
@@ -17,7 +17,7 @@
 /**
  * Renderer for the section links block.
  *
- * @since     2.5
+ * @since     Moodle 2.5
  * @package   block_section_links
  * @copyright 2013 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/selfcompletion/db/upgrade.php b/blocks/selfcompletion/db/upgrade.php
index 2a98e9a19ad..0b5552392ca 100644
--- a/blocks/selfcompletion/db/upgrade.php
+++ b/blocks/selfcompletion/db/upgrade.php
@@ -31,7 +31,7 @@
  * Please do not forget to use upgrade_set_timeout()
  * before any action that may take longer time to finish.
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    block_selfcompletion
  * @copyright 2012 Mark Nelson <markn@moodle.com>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/settings/block_settings.php b/blocks/settings/block_settings.php
index 499dc858c3e..14c486b2a3b 100644
--- a/blocks/settings/block_settings.php
+++ b/blocks/settings/block_settings.php
@@ -18,7 +18,7 @@
  * This file contains classes used to manage the navigation structures in Moodle
  * and was introduced as part of the changes occuring in Moodle 2.0
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package block_settings
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/settings/db/upgrade.php b/blocks/settings/db/upgrade.php
index 2e27da6b4b5..9406123232f 100644
--- a/blocks/settings/db/upgrade.php
+++ b/blocks/settings/db/upgrade.php
@@ -31,7 +31,7 @@
  * Please do not forget to use upgrade_set_timeout()
  * before any action that may take longer time to finish.
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package block_settings
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/settings/edit_form.php b/blocks/settings/edit_form.php
index 12683c7fe75..0874ee619ef 100644
--- a/blocks/settings/edit_form.php
+++ b/blocks/settings/edit_form.php
@@ -17,7 +17,7 @@
 /**
  * Form for editing settings navigation instances.
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package block_settings
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/settings/lang/en/block_settings.php b/blocks/settings/lang/en/block_settings.php
index 18c374b0012..f2ac617577c 100644
--- a/blocks/settings/lang/en/block_settings.php
+++ b/blocks/settings/lang/en/block_settings.php
@@ -18,7 +18,7 @@
 /**
  * This file contains language strings used in the settings navigation block
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package block_settings
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/cache/classes/definition.php b/cache/classes/definition.php
index e6e341a659d..6b4f47b6905 100644
--- a/cache/classes/definition.php
+++ b/cache/classes/definition.php
@@ -205,7 +205,7 @@ class cache_definition {
 
     /**
      * Gets set to true if this definition requires searchable stores.
-     * @since 2.4.4
+     * @since Moodle 2.4.4
      * @var bool
      */
     protected $requiresearchable = false;
@@ -734,7 +734,7 @@ class cache_definition {
 
     /**
      * Returns true if this definition requires a searchable cache.
-     * @since 2.4.4
+     * @since Moodle 2.4.4
      * @return bool
      */
     public function require_searchable() {
diff --git a/cache/classes/factory.php b/cache/classes/factory.php
index d7dad364469..825a44102ed 100644
--- a/cache/classes/factory.php
+++ b/cache/classes/factory.php
@@ -309,7 +309,7 @@ class cache_factory {
 
     /**
      * Returns the cache instances that have been used within this request.
-     * @since 2.6
+     * @since Moodle 2.6
      * @return array
      */
     public function get_caches_in_use() {
diff --git a/cache/classes/interfaces.php b/cache/classes/interfaces.php
index 24996ed4d33..28bcf159ce9 100644
--- a/cache/classes/interfaces.php
+++ b/cache/classes/interfaces.php
@@ -344,7 +344,7 @@ interface cache_is_key_aware {
  * Cache stores can choose to implement this interface.
  * In order for a store to be usable as a session cache it must implement this interface.
  *
- * @since 2.4.4
+ * @since Moodle 2.4.4
  */
 interface cache_is_searchable {
     /**
diff --git a/cache/classes/loaders.php b/cache/classes/loaders.php
index c59af740007..ae2ba70bd82 100644
--- a/cache/classes/loaders.php
+++ b/cache/classes/loaders.php
@@ -892,7 +892,7 @@ class cache implements cache_loader {
     /**
      * Returns the loader associated with this instance.
      *
-     * @since 2.4.4
+     * @since Moodle 2.4.4
      * @return cache|false
      */
     protected function get_loader() {
@@ -902,7 +902,7 @@ class cache implements cache_loader {
     /**
      * Returns the data source associated with this cache.
      *
-     * @since 2.4.4
+     * @since Moodle 2.4.4
      * @return cache_data_source|false
      */
     protected function get_datasource() {
diff --git a/cache/classes/store.php b/cache/classes/store.php
index aad5043e883..ab225756f19 100644
--- a/cache/classes/store.php
+++ b/cache/classes/store.php
@@ -87,7 +87,7 @@ interface cache_store_interface {
  * All cache store plugins must extend this base class.
  * It lays down the foundation for what is required of a cache store plugin.
  *
- * @since 2.4
+ * @since Moodle 2.4
  * @package    core
  * @category   cache
  * @copyright  2012 Sam Hemelryk
@@ -256,7 +256,7 @@ abstract class cache_store implements cache_store_interface {
     /**
      * Performs any necessary operation when the store instance has been created.
      *
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public function instance_created() {
         // By default, do nothing.
@@ -267,7 +267,7 @@ abstract class cache_store implements cache_store_interface {
      *
      * This method may be called before the store has been initialised.
      *
-     * @since 2.5
+     * @since Moodle 2.5
      * @see cleanup()
      */
     public function instance_deleted() {
diff --git a/course/format/lib.php b/course/format/lib.php
index af2a6c6b60a..b51d77dbb3c 100644
--- a/course/format/lib.php
+++ b/course/format/lib.php
@@ -269,7 +269,7 @@ abstract class format_base {
      * So if 'Return to course' does not make sense in your format your should probably return false.
      *
      * @return boolean
-     * @since 2.6
+     * @since Moodle 2.6
      */
     public function has_view_page() {
         return true;
diff --git a/course/format/social/lib.php b/course/format/social/lib.php
index 3c84a152822..a9c62238894 100644
--- a/course/format/social/lib.php
+++ b/course/format/social/lib.php
@@ -17,7 +17,7 @@
 /**
  * This file contains main class for the course format Social
  *
- * @since     2.0
+ * @since     Moodle 2.0
  * @package   format_social
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/course/format/topics/lib.php b/course/format/topics/lib.php
index 7c1ee6ec589..aa043783809 100644
--- a/course/format/topics/lib.php
+++ b/course/format/topics/lib.php
@@ -17,7 +17,7 @@
 /**
  * This file contains main class for the course format Topic
  *
- * @since     2.0
+ * @since     Moodle 2.0
  * @package   format_topics
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/course/format/weeks/lib.php b/course/format/weeks/lib.php
index e361deffaf3..f554d9c0433 100644
--- a/course/format/weeks/lib.php
+++ b/course/format/weeks/lib.php
@@ -17,7 +17,7 @@
 /**
  * This file contains main class for the course format Weeks
  *
- * @since     2.0
+ * @since     Moodle 2.0
  * @package   format_weeks
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/course/lib.php b/course/lib.php
index 42dd374a969..6c13a7d68b5 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -1645,7 +1645,7 @@ function set_coursemodule_visible($id, $visible) {
  * event to the DB.
  *
  * @param int $cmid the course module id
- * @since 2.5
+ * @since Moodle 2.5
  */
 function course_delete_module($cmid) {
     global $CFG, $DB;
diff --git a/course/report/lib.php b/course/report/lib.php
index b5037dfefe7..da6e13b55df 100644
--- a/course/report/lib.php
+++ b/course/report/lib.php
@@ -18,7 +18,7 @@
 /**
  * This file contains functions used by course reports
  *
- * @since 2.1
+ * @since Moodle 2.1
  * @package coursereport
  * @copyright 2011 Andrew Davis
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/course/switchrole.php b/course/switchrole.php
index 533537a0827..a682c37a842 100644
--- a/course/switchrole.php
+++ b/course/switchrole.php
@@ -23,7 +23,7 @@
  * The reason that we created this file was so that user didn't get redirected back
  * to the course view page only to be redirected again.
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package course
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/enrol/mnet/db/mnet.php b/enrol/mnet/db/mnet.php
index 01ad3abe1b1..473a7576e67 100644
--- a/enrol/mnet/db/mnet.php
+++ b/enrol/mnet/db/mnet.php
@@ -20,7 +20,7 @@
  * If we rewrite MNet as proposed in MDL-21993 this file would contain
  * just a declaration of xml-rpc methods that this plugin publishes.
  *
- * @since      2.0
+ * @since      Moodle 2.0
  * @package    enrol_mnet
  * @copyright  2010 Penny Leach
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/accesslib.php b/lib/accesslib.php
index 7d316c498ef..147da15a83c 100644
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -1269,7 +1269,7 @@ function reload_all_capabilities() {
  * Useful for the "temporary guest" access we grant to logged-in users.
  * This is useful for enrol plugins only.
  *
- * @since 2.2
+ * @since Moodle 2.2
  * @param context_course $coursecontext
  * @param int $roleid
  * @return void
@@ -1309,7 +1309,7 @@ function load_temp_course_role(context_course $coursecontext, $roleid) {
  * Removes any extra guest roles from current USER->access array.
  * This is useful for enrol plugins only.
  *
- * @since 2.2
+ * @since Moodle 2.2
  * @param context_course $coursecontext
  * @return void
  */
@@ -4975,7 +4975,7 @@ function role_change_permission($roleid, $context, $capname, $permission) {
  * @category  access
  * @copyright Petr Skoda {@link http://skodak.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since     2.2
+ * @since     Moodle 2.2
  *
  * @property-read int $id context id
  * @property-read int $contextlevel CONTEXT_SYSTEM, CONTEXT_COURSE, etc.
@@ -5786,7 +5786,7 @@ abstract class context extends stdClass implements IteratorAggregate {
  * @category  access
  * @copyright Petr Skoda {@link http://skodak.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since     2.2
+ * @since     Moodle 2.2
  */
 class context_helper extends context {
 
@@ -6062,7 +6062,7 @@ class context_helper extends context {
  * @category  access
  * @copyright Petr Skoda {@link http://skodak.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since     2.2
+ * @since     Moodle 2.2
  */
 class context_system extends context {
     /**
@@ -6303,7 +6303,7 @@ class context_system extends context {
  * @category  access
  * @copyright Petr Skoda {@link http://skodak.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since     2.2
+ * @since     Moodle 2.2
  */
 class context_user extends context {
     /**
@@ -6487,7 +6487,7 @@ class context_user extends context {
  * @category  access
  * @copyright Petr Skoda {@link http://skodak.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since     2.2
+ * @since     Moodle 2.2
  */
 class context_coursecat extends context {
     /**
@@ -6716,7 +6716,7 @@ class context_coursecat extends context {
  * @category  access
  * @copyright Petr Skoda {@link http://skodak.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since     2.2
+ * @since     Moodle 2.2
  */
 class context_course extends context {
     /**
@@ -6935,7 +6935,7 @@ class context_course extends context {
  * @category  access
  * @copyright Petr Skoda {@link http://skodak.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since     2.2
+ * @since     Moodle 2.2
  */
 class context_module extends context {
     /**
@@ -7174,7 +7174,7 @@ class context_module extends context {
  * @category  access
  * @copyright Petr Skoda {@link http://skodak.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since     2.2
+ * @since     Moodle 2.2
  */
 class context_block extends context {
     /**
diff --git a/lib/ajax/getnavbranch.php b/lib/ajax/getnavbranch.php
index 457f8d98cac..e2e319a68b7 100644
--- a/lib/ajax/getnavbranch.php
+++ b/lib/ajax/getnavbranch.php
@@ -19,7 +19,7 @@
  * This file is used to deliver a branch from the navigation structure
  * in XML format back to a page from an AJAX call
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package core
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/ajax/getsiteadminbranch.php b/lib/ajax/getsiteadminbranch.php
index 459d1c388a5..18a8d7f92be 100644
--- a/lib/ajax/getsiteadminbranch.php
+++ b/lib/ajax/getsiteadminbranch.php
@@ -19,7 +19,7 @@
  * This file is used to deliver a branch from the site administration
  * in XML format back to a page from an AJAX call
  *
- * @since 2.6
+ * @since Moodle 2.6
  * @package core
  * @copyright 2013 Rajesh Taneja <rajesh@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/authlib.php b/lib/authlib.php
index 92ac007acaf..2be318eaf69 100644
--- a/lib/authlib.php
+++ b/lib/authlib.php
@@ -518,7 +518,7 @@ class auth_plugin_base {
      * authentication method manually is allowed.
      *
      * @return bool
-     * @since 2.6
+     * @since Moodle 2.6
      */
     function can_be_manually_set() {
         // Override if needed.
diff --git a/lib/classes/text.php b/lib/classes/text.php
index 7b13d7550ce..0cba90716e6 100644
--- a/lib/classes/text.php
+++ b/lib/classes/text.php
@@ -256,7 +256,7 @@ class core_text {
      * @param string $needle The string to find in haystack.
      * @param boolean $part If true, returns the portion before needle, else return the portion after (including needle).
      * @return string|false False when not found.
-     * @since 2.4.6, 2.5.2, 2.6
+     * @since Moodle 2.4.6, 2.5.2, 2.6
      */
     public static function strrchr($haystack, $needle, $part = false) {
 
diff --git a/lib/dml/moodle_database.php b/lib/dml/moodle_database.php
index d53a17231c6..264afcfaf4e 100644
--- a/lib/dml/moodle_database.php
+++ b/lib/dml/moodle_database.php
@@ -1617,7 +1617,7 @@ abstract class moodle_database {
      * This method is intended for inserting of large number of small objects,
      * do not use for huge objects with text or binary fields.
      *
-     * @since 2.7
+     * @since Moodle 2.7
      *
      * @param string $table  The database table to be inserted into
      * @param array|Traversable $dataobjects list of objects to be inserted, must be compatible with foreach
@@ -2229,7 +2229,7 @@ abstract class moodle_database {
     /**
      * Does this driver support tool_replace?
      *
-     * @since 2.6.1
+     * @since Moodle 2.6.1
      * @return bool
      */
     public function replace_all_text_supported() {
@@ -2239,7 +2239,7 @@ abstract class moodle_database {
     /**
      * Replace given text in all rows of column.
      *
-     * @since 2.6.1
+     * @since Moodle 2.6.1
      * @param string $table name of the table
      * @param database_column_info $column
      * @param string $search
diff --git a/lib/dml/mssql_native_moodle_database.php b/lib/dml/mssql_native_moodle_database.php
index 1360898e62a..0b343f0bd18 100644
--- a/lib/dml/mssql_native_moodle_database.php
+++ b/lib/dml/mssql_native_moodle_database.php
@@ -1266,7 +1266,7 @@ s only returning name of SQL substring function, it now requires all parameters.
     /**
      * Does this driver support tool_replace?
      *
-     * @since 2.6.1
+     * @since Moodle 2.6.1
      * @return bool
      */
     public function replace_all_text_supported() {
diff --git a/lib/dml/mysqli_native_moodle_database.php b/lib/dml/mysqli_native_moodle_database.php
index c3c2769048d..5ec79cc5f01 100644
--- a/lib/dml/mysqli_native_moodle_database.php
+++ b/lib/dml/mysqli_native_moodle_database.php
@@ -1153,7 +1153,7 @@ class mysqli_native_moodle_database extends moodle_database {
      * This method is intended for inserting of large number of small objects,
      * do not use for huge objects with text or binary fields.
      *
-     * @since 2.7
+     * @since Moodle 2.7
      *
      * @param string $table  The database table to be inserted into
      * @param array|Traversable $dataobjects list of objects to be inserted, must be compatible with foreach
@@ -1535,7 +1535,7 @@ class mysqli_native_moodle_database extends moodle_database {
     /**
      * Does this driver support tool_replace?
      *
-     * @since 2.6.1
+     * @since Moodle 2.6.1
      * @return bool
      */
     public function replace_all_text_supported() {
diff --git a/lib/dml/pgsql_native_moodle_database.php b/lib/dml/pgsql_native_moodle_database.php
index 1b8150ce8e3..e369d39b4e4 100644
--- a/lib/dml/pgsql_native_moodle_database.php
+++ b/lib/dml/pgsql_native_moodle_database.php
@@ -950,7 +950,7 @@ class pgsql_native_moodle_database extends moodle_database {
      * This method is intended for inserting of large number of small objects,
      * do not use for huge objects with text or binary fields.
      *
-     * @since 2.7
+     * @since Moodle 2.7
      *
      * @param string $table  The database table to be inserted into
      * @param array|Traversable $dataobjects list of objects to be inserted, must be compatible with foreach
@@ -1345,7 +1345,7 @@ class pgsql_native_moodle_database extends moodle_database {
     /**
      * Does this driver support tool_replace?
      *
-     * @since 2.6.1
+     * @since Moodle 2.6.1
      * @return bool
      */
     public function replace_all_text_supported() {
diff --git a/lib/dml/sqlsrv_native_moodle_database.php b/lib/dml/sqlsrv_native_moodle_database.php
index e13047eaae1..a2232ab36e8 100644
--- a/lib/dml/sqlsrv_native_moodle_database.php
+++ b/lib/dml/sqlsrv_native_moodle_database.php
@@ -1333,7 +1333,7 @@ class sqlsrv_native_moodle_database extends moodle_database {
     /**
      * Does this driver support tool_replace?
      *
-     * @since 2.6.1
+     * @since Moodle 2.6.1
      * @return bool
      */
     public function replace_all_text_supported() {
diff --git a/lib/external/externallib.php b/lib/external/externallib.php
index c69681d0e4c..b0897db4beb 100644
--- a/lib/external/externallib.php
+++ b/lib/external/externallib.php
@@ -45,7 +45,7 @@ class core_external extends external_api {
      *
      * @param array $stringparams
      * @return object|string
-     * @since 2.4
+     * @since Moodle 2.4
      */
     public static function format_string_parameters($stringparams) {
         // Check if there are some string params.
diff --git a/lib/externallib.php b/lib/externallib.php
index ad701b29a39..2ce6de661fc 100644
--- a/lib/externallib.php
+++ b/lib/externallib.php
@@ -694,7 +694,7 @@ class external_format_value extends external_value {
  * @param array $format the format to validate
  * @return the validated format
  * @throws coding_exception
- * @since 2.3
+ * @since Moodle 2.3
  */
 function external_validate_format($format) {
     $allowedformats = array(FORMAT_HTML, FORMAT_MOODLE, FORMAT_PLAIN, FORMAT_MARKDOWN);
diff --git a/lib/filelib.php b/lib/filelib.php
index d45b13d908e..6e1b9f6e3e7 100644
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -541,7 +541,7 @@ function file_get_draft_area_info($draftitemid, $filepath = '/') {
  * @param int $newfilesize the size that would be added to the current area.
  * @param bool $includereferences true to include the size of the references in the area size.
  * @return bool true if the area will/has exceeded its limit.
- * @since 2.4
+ * @since Moodle 2.4
  */
 function file_is_draft_area_limit_reached($draftitemid, $areamaxbytes, $newfilesize = 0, $includereferences = false) {
     if ($areamaxbytes != FILE_AREA_MAX_BYTES_UNLIMITED) {
diff --git a/lib/filestorage/file_storage.php b/lib/filestorage/file_storage.php
index 299dbb2ac8c..32fec854601 100644
--- a/lib/filestorage/file_storage.php
+++ b/lib/filestorage/file_storage.php
@@ -199,7 +199,7 @@ class file_storage {
      * @param string $filename the file name.
      * @return string available file name.
      * @throws coding_exception if the file name is invalid.
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public function get_unused_filename($contextid, $component, $filearea, $itemid, $filepath, $filename) {
         global $DB;
@@ -280,7 +280,7 @@ class file_storage {
      * @param int $itemid area item ID.
      * @param string $suggestedpath the suggested file path.
      * @return string available file path
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public function get_unused_dirname($contextid, $component, $filearea, $itemid, $suggestedpath) {
         global $DB;
diff --git a/lib/filterlib.php b/lib/filterlib.php
index 5aca116f7ab..f47d6ce923b 100644
--- a/lib/filterlib.php
+++ b/lib/filterlib.php
@@ -247,7 +247,7 @@ class filter_manager {
      *
      * @param moodle_page $page the page we are going to add requirements to.
      * @param context $context the context which contents are going to be filtered.
-     * @since 2.3
+     * @since Moodle 2.3
      */
     public function setup_page_for_filters($page, $context) {
         $filters = $this->get_text_filters($context);
@@ -409,7 +409,7 @@ abstract class moodle_text_filter {
      *
      * @param moodle_page $page the page we are going to add requirements to.
      * @param context $context the context which contents are going to be filtered.
-     * @since 2.3
+     * @since Moodle 2.3
      */
     public function setup($page, $context) {
         // Override me, if needed.
diff --git a/lib/form/text.php b/lib/form/text.php
index 57bbd948df3..97a0219eb71 100644
--- a/lib/form/text.php
+++ b/lib/form/text.php
@@ -67,7 +67,7 @@ class MoodleQuickForm_text extends HTML_QuickForm_text{
     /**
      * Freeze the element so that only its value is returned and set persistantfreeze to false
      *
-     * @since     2.4
+     * @since     Moodle 2.4
      * @access    public
      * @return    void
      */
@@ -81,7 +81,7 @@ class MoodleQuickForm_text extends HTML_QuickForm_text{
     /**
      * Returns the html to be used when the element is frozen
      *
-     * @since     2.4
+     * @since     Moodle 2.4
      * @return    string Frozen html
      */
     function getFrozenHtml()
diff --git a/lib/google/curlio.php b/lib/google/curlio.php
index f3da219de6c..75a76c0af14 100644
--- a/lib/google/curlio.php
+++ b/lib/google/curlio.php
@@ -183,7 +183,7 @@ class moodle_google_curlio extends Google_CurlIO {
      * @param int $constant value of a CURL constant.
      * @return string name of the constant if found, or throws exception.
      * @throws coding_exception when the constant is not found.
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public function get_option_name_from_constant($constant) {
         if (is_null(self::$constants)) {
diff --git a/lib/gradelib.php b/lib/gradelib.php
index 3ad3a6a7daa..75a6f20df17 100644
--- a/lib/gradelib.php
+++ b/lib/gradelib.php
@@ -1455,7 +1455,7 @@ function grade_floats_different($f1, $f2) {
  * Do not use rounding for 10,5 at the database level as the results may be
  * different from php round() function.
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @param float $f1 Float one to compare
  * @param float $f2 Float two to compare
  * @return bool True if the values should be considered as the same grades
diff --git a/lib/licenselib.php b/lib/licenselib.php
index 5cd4c3df811..e49343754b5 100644
--- a/lib/licenselib.php
+++ b/lib/licenselib.php
@@ -19,7 +19,7 @@
 /**
  * A namespace contains license specific functions
  *
- * @since      2.0
+ * @since      Moodle 2.0
  * @package    core
  * @subpackage lib
  * @copyright  2010 Dongsheng Cai <dongsheng@moodle.com>
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 5baa14cc723..3b76dd97255 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -2174,7 +2174,7 @@ function userdate($date, $format = '', $timezone = 99, $fixday = true, $fixhour
  * @param string $format strftime format.
  * @param int|float $tz the numerical timezone, typically returned by {@link get_user_timezone_offset()}.
  * @return string the formatted date/time.
- * @since 2.3.3
+ * @since Moodle 2.3.3
  */
 function date_format_string($date, $format, $tz = 99) {
     global $CFG;
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index d5196ad7255..b0f14f11428 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -17,7 +17,7 @@
 /**
  * This file contains classes used to manage the navigation structures within Moodle.
  *
- * @since      2.0
+ * @since      Moodle 2.0
  * @package    core
  * @copyright  2009 Sam Hemelryk
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -697,7 +697,7 @@ class navigation_node implements renderable {
     /**
      * Hides the node and any children it has.
      *
-     * @since 2.5
+     * @since Moodle 2.5
      * @param array $typestohide Optional. An array of node types that should be hidden.
      *      If null all nodes will be hidden.
      *      If an array is given then nodes will only be hidden if their type mtatches an element in the array.
@@ -1323,7 +1323,7 @@ class global_navigation extends navigation_node {
      * other user being viewed this function returns false.
      * In order to set the user for whom we are checking against you must call {@link set_userid_for_parent_checks()}
      *
-     * @since 2.4
+     * @since Moodle 2.4
      * @return bool
      */
     protected function current_user_is_parent_role() {
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index cf1aaa9625b..a732782708c 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -3224,7 +3224,7 @@ EOD;
     /**
      * Get the HTML for blocks in the given region.
      *
-     * @since 2.5.1 2.6
+     * @since Moodle 2.5.1 2.6
      * @param string $region The region to get HTML for.
      * @return string HTML.
      */
@@ -3271,7 +3271,7 @@ EOD;
     /**
      * Returns the CSS classes to apply to the body tag.
      *
-     * @since 2.5.1 2.6
+     * @since Moodle 2.5.1 2.6
      * @param array $additionalclasses Any additional classes to apply.
      * @return string
      */
@@ -3301,7 +3301,7 @@ EOD;
     /**
      * The ID attribute to apply to the body tag.
      *
-     * @since 2.5.1 2.6
+     * @since Moodle 2.5.1 2.6
      * @return string
      */
     public function body_id() {
@@ -3311,7 +3311,7 @@ EOD;
     /**
      * Returns HTML attributes to use within the body tag. This includes an ID and classes.
      *
-     * @since 2.5.1 2.6
+     * @since Moodle 2.5.1 2.6
      * @param string|array $additionalclasses Any additional classes to give the body tag,
      * @return string
      */
@@ -3325,7 +3325,7 @@ EOD;
     /**
      * Gets HTML for the page heading.
      *
-     * @since 2.5.1 2.6
+     * @since Moodle 2.5.1 2.6
      * @param string $tag The tag to encase the heading in. h1 by default.
      * @return string HTML.
      */
@@ -3336,7 +3336,7 @@ EOD;
     /**
      * Gets the HTML for the page heading button.
      *
-     * @since 2.5.1 2.6
+     * @since Moodle 2.5.1 2.6
      * @return string HTML.
      */
     public function page_heading_button() {
@@ -3346,7 +3346,7 @@ EOD;
     /**
      * Returns the Moodle docs link to use for this page.
      *
-     * @since 2.5.1 2.6
+     * @since Moodle 2.5.1 2.6
      * @param string $text
      * @return string
      */
@@ -3364,7 +3364,7 @@ EOD;
     /**
      * Returns the page heading menu.
      *
-     * @since 2.5.1 2.6
+     * @since Moodle 2.5.1 2.6
      * @return string HTML.
      */
     public function page_heading_menu() {
@@ -3374,7 +3374,7 @@ EOD;
     /**
      * Returns the title to use on the page.
      *
-     * @since 2.5.1 2.6
+     * @since Moodle 2.5.1 2.6
      * @return string
      */
     public function page_title() {
@@ -3384,7 +3384,7 @@ EOD;
     /**
      * Returns the URL for the favicon.
      *
-     * @since 2.5.1 2.6
+     * @since Moodle 2.5.1 2.6
      * @return string The favicon URL
      */
     public function favicon() {
@@ -3853,7 +3853,7 @@ class core_media_renderer extends plugin_renderer_base {
  * is running a maintenance related task.
  * It must always extend the core_renderer as we switch from the core_renderer to this renderer in a couple of places.
  *
- * @since 2.6
+ * @since Moodle 2.6
  * @package core
  * @category output
  * @copyright 2013 Sam Hemelryk
diff --git a/lib/pagelib.php b/lib/pagelib.php
index 3aae32fd3e2..c650dadf148 100644
--- a/lib/pagelib.php
+++ b/lib/pagelib.php
@@ -642,7 +642,7 @@ class moodle_page {
     /**
      * Returns an array of minipulations or false if there are none to make.
      *
-     * @since 2.5.1 2.6
+     * @since Moodle 2.5.1 2.6
      * @return bool|array
      */
     protected function magic_get_blockmanipulations() {
@@ -1906,7 +1906,7 @@ class moodle_page {
     /**
      * Returns the block region having made any required theme manipulations.
      *
-     * @since 2.5.1 2.6
+     * @since Moodle 2.5.1 2.6
      * @param string $region
      * @return string
      */
diff --git a/lib/pdflib.php b/lib/pdflib.php
index 1405ff1182e..cd2048b5770 100644
--- a/lib/pdflib.php
+++ b/lib/pdflib.php
@@ -134,7 +134,7 @@ class pdf extends TCPDF {
      * @param $name (string) The name of the file when saved. Note that special characters are removed and blanks characters are replaced with the underscore character.
      * @param $dest (string) Destination where to send the document. It can take one of the following values:<ul><li>I: send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.</li><li>D: send to the browser and force a file download with the name given by name.</li><li>F: save to a local server file with the name given by name.</li><li>S: return the document as a string (name is ignored).</li><li>FI: equivalent to F + I option</li><li>FD: equivalent to F + D option</li><li>E: return the document as base64 mime multi-part email attachment (RFC 2045)</li></ul>
      * @public
-     * @since 1.0
+     * @since Moodle 1.0
      * @see Close()
      */
     public function Output($name='doc.pdf', $dest='I') {
diff --git a/lib/plagiarismlib.php b/lib/plagiarismlib.php
index 566587d7492..1c28f17b301 100644
--- a/lib/plagiarismlib.php
+++ b/lib/plagiarismlib.php
@@ -18,7 +18,7 @@
 /**
  * plagiarismlib.php - Contains core Plagiarism related functions.
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    moodlecore
  * @subpackage plagiarism
  * @copyright  2010 Dan Marsden http://danmarsden.com
diff --git a/lib/testing/generator/data_generator.php b/lib/testing/generator/data_generator.php
index ea316a7b3cc..67e44bec425 100644
--- a/lib/testing/generator/data_generator.php
+++ b/lib/testing/generator/data_generator.php
@@ -588,7 +588,7 @@ EOD;
      * @param array|stdClass $record data to use to up set the instance.
      * @param array $options options
      * @return stdClass repository instance record
-     * @since 2.5.1
+     * @since Moodle 2.5.1
      */
     public function create_repository($type, $record=null, array $options = null) {
         $generator = $this->get_plugin_generator('repository_'.$type);
@@ -602,7 +602,7 @@ EOD;
      * @param array|stdClass $record data to use to up set the instance.
      * @param array $options options
      * @return repository_type object
-     * @since 2.5.1
+     * @since Moodle 2.5.1
      */
     public function create_repository_type($type, $record=null, array $options = null) {
         $generator = $this->get_plugin_generator('repository_'.$type);
diff --git a/lib/testing/generator/repository_generator.php b/lib/testing/generator/repository_generator.php
index e190a590bb9..3d5f560eaaf 100644
--- a/lib/testing/generator/repository_generator.php
+++ b/lib/testing/generator/repository_generator.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @category   test
  * @copyright  2013 Frédéric Massart
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since      2.5.1
+ * @since      Moodle 2.5.1
  */
 class testing_repository_generator extends component_generator_base {
 
diff --git a/lib/upgradelib.php b/lib/upgradelib.php
index 01e48c1d23a..03d307f373c 100644
--- a/lib/upgradelib.php
+++ b/lib/upgradelib.php
@@ -1999,7 +1999,7 @@ function upgrade_save_orphaned_questions() {
  * @see backup_cron_automated_helper::remove_excess_backups()
  * @link http://tracker.moodle.org/browse/MDL-35116
  * @return void
- * @since 2.4
+ * @since Moodle 2.4
  */
 function upgrade_rename_old_backup_files_using_shortname() {
     global $CFG;
diff --git a/lib/weblib.php b/lib/weblib.php
index 6bb45d0f484..e6b0b7f028b 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -973,7 +973,7 @@ function page_doc_link($text='') {
 /**
  * Returns the path to use when constructing a link to the docs.
  *
- * @since 2.5.1 2.6
+ * @since Moodle 2.5.1 2.6
  * @param moodle_page $page
  * @return string
  */
diff --git a/message/externallib.php b/message/externallib.php
index c42df23c266..1ea4932bc46 100644
--- a/message/externallib.php
+++ b/message/externallib.php
@@ -189,7 +189,7 @@ class core_message_external extends external_api {
      * Create contacts parameters description.
      *
      * @return external_function_parameters
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public static function create_contacts_parameters() {
         return new external_function_parameters(
@@ -207,7 +207,7 @@ class core_message_external extends external_api {
      *
      * @param array $userids array of user IDs.
      * @return external_description
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public static function create_contacts($userids) {
         $params = array('userids' => $userids);
@@ -231,7 +231,7 @@ class core_message_external extends external_api {
      * Create contacts return description.
      *
      * @return external_description
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public static function create_contacts_returns() {
         return new external_warnings();
@@ -241,7 +241,7 @@ class core_message_external extends external_api {
      * Delete contacts parameters description.
      *
      * @return external_function_parameters
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public static function delete_contacts_parameters() {
         return new external_function_parameters(
@@ -259,7 +259,7 @@ class core_message_external extends external_api {
      *
      * @param array $userids array of user IDs.
      * @return null
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public static function delete_contacts($userids) {
         $params = array('userids' => $userids);
@@ -276,7 +276,7 @@ class core_message_external extends external_api {
      * Delete contacts return description.
      *
      * @return external_description
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public static function delete_contacts_returns() {
         return null;
@@ -286,7 +286,7 @@ class core_message_external extends external_api {
      * Block contacts parameters description.
      *
      * @return external_function_parameters
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public static function block_contacts_parameters() {
         return new external_function_parameters(
@@ -304,7 +304,7 @@ class core_message_external extends external_api {
      *
      * @param array $userids array of user IDs.
      * @return external_description
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public static function block_contacts($userids) {
         $params = array('userids' => $userids);
@@ -328,7 +328,7 @@ class core_message_external extends external_api {
      * Block contacts return description.
      *
      * @return external_description
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public static function block_contacts_returns() {
         return new external_warnings();
@@ -338,7 +338,7 @@ class core_message_external extends external_api {
      * Unblock contacts parameters description.
      *
      * @return external_function_parameters
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public static function unblock_contacts_parameters() {
         return new external_function_parameters(
@@ -356,7 +356,7 @@ class core_message_external extends external_api {
      *
      * @param array $userids array of user IDs.
      * @return null
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public static function unblock_contacts($userids) {
         $params = array('userids' => $userids);
@@ -373,7 +373,7 @@ class core_message_external extends external_api {
      * Unblock contacts return description.
      *
      * @return external_description
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public static function unblock_contacts_returns() {
         return null;
@@ -383,7 +383,7 @@ class core_message_external extends external_api {
      * Get contacts parameters description.
      *
      * @return external_function_parameters
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public static function get_contacts_parameters() {
         return new external_function_parameters(array());
@@ -394,7 +394,7 @@ class core_message_external extends external_api {
      *
      * @param array $userids array of user IDs.
      * @return external_description
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public static function get_contacts() {
         global $CFG;
@@ -427,7 +427,7 @@ class core_message_external extends external_api {
      * Get contacts return description.
      *
      * @return external_description
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public static function get_contacts_returns() {
         return new external_single_structure(
@@ -476,7 +476,7 @@ class core_message_external extends external_api {
      * Search contacts parameters description.
      *
      * @return external_function_parameters
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public static function search_contacts_parameters() {
         return new external_function_parameters(
@@ -494,7 +494,7 @@ class core_message_external extends external_api {
      * @param string $searchtext query string.
      * @param bool $onlymycourses limit the search to the user's courses only.
      * @return external_description
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public static function search_contacts($searchtext, $onlymycourses = false) {
         global $CFG, $USER;
@@ -553,7 +553,7 @@ class core_message_external extends external_api {
      * Search contacts return description.
      *
      * @return external_description
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public static function search_contacts_returns() {
         return new external_multiple_structure(
diff --git a/mod/chat/lib.php b/mod/chat/lib.php
index 4a29db723ec..b68ec8b116b 100644
--- a/mod/chat/lib.php
+++ b/mod/chat/lib.php
@@ -663,7 +663,7 @@ function chat_update_chat_times($chatid=0) {
  * @param bool $system False for non-system messages, true for system messages.
  * @param object $cm The course module object, pass it to save a database query when we trigger the event.
  * @return int The message ID.
- * @since 2.6
+ * @since Moodle 2.6
  */
 function chat_send_chatmessage($chatuser, $messagetext, $system = false, $cm = null) {
     global $DB;
diff --git a/plagiarism/lib.php b/plagiarism/lib.php
index b41d785e754..8e6feca7be5 100644
--- a/plagiarism/lib.php
+++ b/plagiarism/lib.php
@@ -18,7 +18,7 @@
 /**
  * lib.php - Contains Plagiarism base class used by plugins.
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    moodlecore
  * @subpackage plagiarism
  * @copyright  2010 Dan Marsden http://danmarsden.com
diff --git a/portfolio/mahara/db/mnet.php b/portfolio/mahara/db/mnet.php
index c2c42f47a71..53ed666338e 100644
--- a/portfolio/mahara/db/mnet.php
+++ b/portfolio/mahara/db/mnet.php
@@ -18,7 +18,7 @@
 /**
  * This file contains the mnet services for the mahara portfolio plugin
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package moodlecore
  * @subpackage portfolio
  * @copyright 2010 Penny Leach
diff --git a/portfolio/mahara/lib.php b/portfolio/mahara/lib.php
index b0bbcc64c1d..ee725bd2c07 100644
--- a/portfolio/mahara/lib.php
+++ b/portfolio/mahara/lib.php
@@ -18,7 +18,7 @@
 /**
  * This file contains the class definition for the mahara portfolio plugin
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package moodlecore
  * @subpackage portfolio
  * @copyright 2009 Penny Leach
diff --git a/portfolio/mahara/preconfig.php b/portfolio/mahara/preconfig.php
index f4cc3a7e587..ea923dc12e1 100644
--- a/portfolio/mahara/preconfig.php
+++ b/portfolio/mahara/preconfig.php
@@ -18,7 +18,7 @@
 /**
  * This file is the landing point for returning to moodle after authenticating at mahara
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package moodlecore
  * @subpackage portfolio
  * @copyright 2009 Penny Leach
diff --git a/portfolio/mahara/version.php b/portfolio/mahara/version.php
index 58c4eb5bad8..b6dc1eb9667 100644
--- a/portfolio/mahara/version.php
+++ b/portfolio/mahara/version.php
@@ -17,7 +17,7 @@
 /**
  * This file contains the version information for the mahara portfolio plugin
  *
- * @since      2.0
+ * @since      Moodle 2.0
  * @package    portfolio
  * @subpackage mahara
  * @copyright  2009 Penny Leach
diff --git a/question/type/calculated/lib.php b/question/type/calculated/lib.php
index 57ba58f37e8..262b705c5a9 100644
--- a/question/type/calculated/lib.php
+++ b/question/type/calculated/lib.php
@@ -17,7 +17,7 @@
 /**
  * Serve question type files
  *
- * @since      2.0
+ * @since      Moodle 2.0
  * @package    qtype_calculated
  * @copyright  Dongsheng Cai <dongsheng@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/question/type/calculatedmulti/lib.php b/question/type/calculatedmulti/lib.php
index d91370f0c23..1d10bf71b0d 100644
--- a/question/type/calculatedmulti/lib.php
+++ b/question/type/calculatedmulti/lib.php
@@ -17,7 +17,7 @@
 /**
  * Serve question type files
  *
- * @since      2.0
+ * @since      Moodle 2.0
  * @package    qtype_calculatedmulti
  * @copyright  Dongsheng Cai <dongsheng@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/question/type/calculatedsimple/lib.php b/question/type/calculatedsimple/lib.php
index 4002e965b65..4bf76a0b37f 100644
--- a/question/type/calculatedsimple/lib.php
+++ b/question/type/calculatedsimple/lib.php
@@ -17,7 +17,7 @@
 /**
  * Serve question type files
  *
- * @since      2.0
+ * @since      Moodle 2.0
  * @package    qtype_calculatedsimple
  * @copyright  Dongsheng Cai <dongsheng@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/question/type/essay/lib.php b/question/type/essay/lib.php
index 0aa4551797c..c9bf3fbb273 100644
--- a/question/type/essay/lib.php
+++ b/question/type/essay/lib.php
@@ -17,7 +17,7 @@
 /**
  * Serve question type files
  *
- * @since      2.0
+ * @since      Moodle 2.0
  * @package    qtype_essay
  * @copyright  Dongsheng Cai <dongsheng@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/question/type/match/lib.php b/question/type/match/lib.php
index ff31bc4ec23..e3652e8e744 100644
--- a/question/type/match/lib.php
+++ b/question/type/match/lib.php
@@ -17,7 +17,7 @@
 /**
  * Serve question type files
  *
- * @since      2.0
+ * @since      Moodle 2.0
  * @package    qtype_match
  * @copyright  Dongsheng Cai <dongsheng@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/question/type/multichoice/lib.php b/question/type/multichoice/lib.php
index 9d5b0e20cb8..e74ba337bf5 100644
--- a/question/type/multichoice/lib.php
+++ b/question/type/multichoice/lib.php
@@ -17,7 +17,7 @@
 /**
  * Serve question type files
  *
- * @since      2.0
+ * @since      Moodle 2.0
  * @package    qtype_multichoice
  * @copyright  Dongsheng Cai <dongsheng@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/question/type/numerical/lib.php b/question/type/numerical/lib.php
index b1b4ec26693..b0df47d9d78 100644
--- a/question/type/numerical/lib.php
+++ b/question/type/numerical/lib.php
@@ -17,7 +17,7 @@
 /**
  * Serve question type files
  *
- * @since      2.0
+ * @since      Moodle 2.0
  * @package    qtype_numerical
  * @copyright  Dongsheng Cai <dongsheng@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/question/type/randomsamatch/lib.php b/question/type/randomsamatch/lib.php
index 110a4fd1f1e..8789a990712 100644
--- a/question/type/randomsamatch/lib.php
+++ b/question/type/randomsamatch/lib.php
@@ -17,7 +17,7 @@
 /**
  * Serve question type files
  *
- * @since      2.0
+ * @since      Moodle 2.0
  * @package    qtype_randomsamatch
  * @copyright  2013 Jean-Michel Vedrine
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/question/type/shortanswer/lib.php b/question/type/shortanswer/lib.php
index 606085aab65..8c981d72793 100644
--- a/question/type/shortanswer/lib.php
+++ b/question/type/shortanswer/lib.php
@@ -17,7 +17,7 @@
 /**
  * Serve question type files
  *
- * @since      2.0
+ * @since      Moodle 2.0
  * @package    qtype_shortanswer
  * @copyright  Dongsheng Cai <dongsheng@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/question/type/truefalse/lib.php b/question/type/truefalse/lib.php
index 2e71c33be0a..9f403b3a427 100644
--- a/question/type/truefalse/lib.php
+++ b/question/type/truefalse/lib.php
@@ -17,7 +17,7 @@
 /**
  * Serve question type files
  *
- * @since      2.0
+ * @since      Moodle 2.0
  * @package    qtype_truefalse
  * @copyright  2010 The Open Unviersity
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/alfresco/lib.php b/repository/alfresco/lib.php
index 10856f1f329..c39301f38d2 100644
--- a/repository/alfresco/lib.php
+++ b/repository/alfresco/lib.php
@@ -17,7 +17,7 @@
 /**
  * This plugin is used to access alfresco repository
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_alfresco
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -28,7 +28,7 @@ require_once($CFG->dirroot . '/repository/lib.php');
  * repository_alfresco class
  * This is a class used to browse files from alfresco
  *
- * @since      2.0
+ * @since      Moodle 2.0
  * @package    repository_alfresco
  * @copyright  2009 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/boxnet/lib.php b/repository/boxnet/lib.php
index d5ce7d58c9d..8d6267831cb 100644
--- a/repository/boxnet/lib.php
+++ b/repository/boxnet/lib.php
@@ -17,7 +17,7 @@
 /**
  * This plugin is used to access box.net repository
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_boxnet
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -28,7 +28,7 @@ require_once($CFG->libdir . '/boxlib.php');
 /**
  * repository_boxnet class implements box.net client
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_boxnet
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/coursefiles/lib.php b/repository/coursefiles/lib.php
index e65275667e2..199be34c44f 100644
--- a/repository/coursefiles/lib.php
+++ b/repository/coursefiles/lib.php
@@ -17,7 +17,7 @@
 /**
  * This plugin is used to access coursefiles repository
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_coursefiles
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -27,7 +27,7 @@ require_once($CFG->dirroot . '/repository/lib.php');
 /**
  * repository_coursefiles class is used to browse course files
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_coursefiles
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/draftfiles_manager.php b/repository/draftfiles_manager.php
index cc096419fd7..3d3223171e5 100644
--- a/repository/draftfiles_manager.php
+++ b/repository/draftfiles_manager.php
@@ -25,7 +25,7 @@
 /**
  * This file is used to manage draft files in non-javascript browsers
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    core
  * @subpackage repository
  * @copyright  2010 Dongsheng Cai <dongsheng@moodle.com>
diff --git a/repository/dropbox/lib.php b/repository/dropbox/lib.php
index 726405aada0..46611afa177 100644
--- a/repository/dropbox/lib.php
+++ b/repository/dropbox/lib.php
@@ -17,7 +17,7 @@
 /**
  * This plugin is used to access user's dropbox files
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_dropbox
  * @copyright  2012 Marina Glancy
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
diff --git a/repository/dropbox/locallib.php b/repository/dropbox/locallib.php
index a9e6a8ee7dc..d376685558b 100644
--- a/repository/dropbox/locallib.php
+++ b/repository/dropbox/locallib.php
@@ -17,7 +17,7 @@
 /**
  * A helper class to access dropbox resources
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_dropbox
  * @copyright  2012 Marina Glancy
  * @copyright  2010 Dongsheng Cai
diff --git a/repository/equella/callback.php b/repository/equella/callback.php
index 01fc27dc7f3..987cfcacd28 100644
--- a/repository/equella/callback.php
+++ b/repository/equella/callback.php
@@ -17,7 +17,7 @@
 /**
  * Callback for equella repository.
  *
- * @since 2.3
+ * @since Moodle 2.3
  * @package   repository_equella
  * @copyright 2012 Dongsheng Cai {@link http://dongsheng.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/equella/lib.php b/repository/equella/lib.php
index 5d74d893868..632e9e19df1 100644
--- a/repository/equella/lib.php
+++ b/repository/equella/lib.php
@@ -17,7 +17,7 @@
 /**
  * This plugin is used to access equella repositories.
  *
- * @since 2.3
+ * @since Moodle 2.3
  * @package    repository_equella
  * @copyright  2012 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -30,7 +30,7 @@ require_once($CFG->dirroot . '/repository/lib.php');
 /**
  * repository_equella class implements equella_client
  *
- * @since 2.3
+ * @since Moodle 2.3
  * @package    repository_equella
  * @copyright  2012 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/equella/version.php b/repository/equella/version.php
index efa2fa65693..3058f51568a 100644
--- a/repository/equella/version.php
+++ b/repository/equella/version.php
@@ -17,7 +17,7 @@
 /**
  * Version information for equella repository.
  *
- * @since 2.3
+ * @since Moodle 2.3
  * @package    repository_equella
  * @copyright  2012 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/filepicker.php b/repository/filepicker.php
index aff254a51be..46c94c64ffa 100644
--- a/repository/filepicker.php
+++ b/repository/filepicker.php
@@ -19,7 +19,7 @@
 /**
  * This file is used to browse repositories in non-javascript mode
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    core
  * @subpackage repository
  * @copyright  2009 Dongsheng Cai <dongsheng@moodle.com>
diff --git a/repository/filesystem/lib.php b/repository/filesystem/lib.php
index fd6f5723e50..039616b8ddf 100644
--- a/repository/filesystem/lib.php
+++ b/repository/filesystem/lib.php
@@ -17,7 +17,7 @@
 /**
  * This plugin is used to access files on server file system
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_filesystem
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/flickr/lib.php b/repository/flickr/lib.php
index c148648ab37..8e16011d7d7 100644
--- a/repository/flickr/lib.php
+++ b/repository/flickr/lib.php
@@ -17,7 +17,7 @@
 /**
  * This plugin is used to access flickr pictures
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_flickr
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -28,7 +28,7 @@ require_once($CFG->libdir.'/flickrlib.php');
 /**
  * This plugin is used to access user's private flickr repository
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_flickr
  * @copyright  2009 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/flickr_public/lib.php b/repository/flickr_public/lib.php
index 666c715736a..bde541e1387 100644
--- a/repository/flickr_public/lib.php
+++ b/repository/flickr_public/lib.php
@@ -17,7 +17,7 @@
 /**
  * This plugin is used to access flickr pictures
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_flickr_public
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -32,7 +32,7 @@ require_once(dirname(__FILE__) . '/image.php');
  * You can set up a public account in admin page, so everyone can access
  * flickr photos from this plugin
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_flickr_public
  * @copyright  2009 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/googledocs/lib.php b/repository/googledocs/lib.php
index 40c056e3a52..d6c77d88e95 100644
--- a/repository/googledocs/lib.php
+++ b/repository/googledocs/lib.php
@@ -17,7 +17,7 @@
 /**
  * This plugin is used to access Google Drive.
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_googledocs
  * @copyright  2009 Dan Poltawski <talktodan@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -32,7 +32,7 @@ require_once($CFG->libdir . '/google/contrib/Google_DriveService.php');
 /**
  * Google Docs Plugin
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_googledocs
  * @copyright  2009 Dan Poltawski <talktodan@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/lib.php b/repository/lib.php
index 1b23ad58030..f1a60d370ba 100644
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -17,7 +17,7 @@
 /**
  * This file contains classes used to manage the repository plugins in Moodle
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package   core_repository
  * @copyright 2009 Dongsheng Cai {@link http://dongsheng.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -659,7 +659,7 @@ abstract class repository implements cacheable_object {
      * Returns the type name of the repository.
      *
      * @return string type name of the repository.
-     * @since  2.5
+     * @since  Moodle 2.5
      */
     public function get_typename() {
         if (empty($this->typename)) {
@@ -1868,7 +1868,7 @@ abstract class repository implements cacheable_object {
      * can be edited.
      *
      * @return bool true if the user can edit the instance.
-     * @since 2.5
+     * @since Moodle 2.5
      */
     public final function can_be_edited_by_user() {
         global $USER;
@@ -1925,7 +1925,7 @@ abstract class repository implements cacheable_object {
      * the user instances will be protected when they need to.
      *
      * @return boolean True when the repository accesses private external data.
-     * @since  2.5
+     * @since  Moodle 2.5
      */
     public function contains_private_data() {
         return true;
@@ -2219,7 +2219,7 @@ abstract class repository implements cacheable_object {
      *
      * @param array $breadcrumb contains each element of the breadcrumb.
      * @return array of breadcrumb elements.
-     * @since 2.3.3
+     * @since Moodle 2.3.3
      */
     protected static function prepare_breadcrumb($breadcrumb) {
         global $OUTPUT;
@@ -2240,7 +2240,7 @@ abstract class repository implements cacheable_object {
      *
      * @param array $list of files and folders.
      * @return array of files and folders.
-     * @since 2.3.3
+     * @since Moodle 2.3.3
      */
     protected static function prepare_list($list) {
         global $OUTPUT;
@@ -2958,7 +2958,7 @@ abstract class repository implements cacheable_object {
 /**
  * Exception class for repository api
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package   core_repository
  * @copyright 2009 Dongsheng Cai {@link http://dongsheng.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -2969,7 +2969,7 @@ class repository_exception extends moodle_exception {
 /**
  * This is a class used to define a repository instance form
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package   core_repository
  * @copyright 2009 Dongsheng Cai {@link http://dongsheng.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -3089,7 +3089,7 @@ final class repository_instance_form extends moodleform {
 /**
  * This is a class used to define a repository type setting form
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package   core_repository
  * @copyright 2009 Dongsheng Cai {@link http://dongsheng.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/local/lib.php b/repository/local/lib.php
index 206162afa16..2b49d04e726 100644
--- a/repository/local/lib.php
+++ b/repository/local/lib.php
@@ -17,7 +17,7 @@
 /**
  * This plugin is used to access local files
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_local
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -27,7 +27,7 @@ require_once($CFG->dirroot . '/repository/lib.php');
 /**
  * repository_local class is used to browse moodle files
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_local
  * @copyright  2012 Marina Glancy
  * @copyright  2009 Dongsheng Cai {@link http://dongsheng.org}
diff --git a/repository/manage_instances.php b/repository/manage_instances.php
index 8e64b7a6003..4fe441a1e82 100644
--- a/repository/manage_instances.php
+++ b/repository/manage_instances.php
@@ -19,7 +19,7 @@
 /**
  * This file is used to manage repositories
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    core
  * @subpackage repository
  * @copyright  2009 Dongsheng Cai <dongsheng@moodle.com>
diff --git a/repository/merlot/lib.php b/repository/merlot/lib.php
index fcc55af4f80..01af4404903 100644
--- a/repository/merlot/lib.php
+++ b/repository/merlot/lib.php
@@ -17,7 +17,7 @@
 /**
  * This plugin is used to access merlot files
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_merlot
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -27,7 +27,7 @@ require_once($CFG->dirroot . '/repository/lib.php');
 /**
  * repository_merlot is used to search merlot.org in moodle
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_merlot
  * @copyright  2009 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/picasa/lib.php b/repository/picasa/lib.php
index 11f8eb0be69..362289bf1f1 100644
--- a/repository/picasa/lib.php
+++ b/repository/picasa/lib.php
@@ -17,7 +17,7 @@
 /**
  * This plugin is used to access picasa pictures
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_picasa
  * @copyright  2009 Dan Poltawski <talktodan@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -28,7 +28,7 @@ require_once($CFG->libdir.'/googleapi.php');
 /**
  * Picasa Repository Plugin
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository
  * @subpackage picasa
  * @copyright  2009 Dan Poltawski
diff --git a/repository/recent/lib.php b/repository/recent/lib.php
index 2471aa6093c..f016492ab4a 100644
--- a/repository/recent/lib.php
+++ b/repository/recent/lib.php
@@ -18,7 +18,7 @@
 /**
  * This plugin is used to access recent used files
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_recent
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -28,7 +28,7 @@ require_once($CFG->dirroot . '/repository/lib.php');
 /**
  * repository_recent class is used to browse recent used files
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_recent
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/repository_ajax.php b/repository/repository_ajax.php
index fe4316d61a0..c63c5085b64 100644
--- a/repository/repository_ajax.php
+++ b/repository/repository_ajax.php
@@ -18,7 +18,7 @@
 /**
  * The Web service script that is called from the filepicker front end
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository
  * @copyright  2009 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/repository_callback.php b/repository/repository_callback.php
index f1e1be55bfa..da8b9416374 100644
--- a/repository/repository_callback.php
+++ b/repository/repository_callback.php
@@ -19,7 +19,7 @@
 /**
  * Repository instance callback script
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    core
  * @subpackage repository
  * @copyright  2009 Dongsheng Cai <dongsheng@moodle.com>
diff --git a/repository/s3/lib.php b/repository/s3/lib.php
index f9d8bff61e6..852f5f7045a 100644
--- a/repository/s3/lib.php
+++ b/repository/s3/lib.php
@@ -18,7 +18,7 @@
 /**
  * This plugin is used to access s3 files
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_s3
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -29,7 +29,7 @@ require_once($CFG->dirroot . '/repository/s3/S3.php');
 /**
  * This is a repository class used to browse Amazon S3 content.
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_s3
  * @copyright  2009 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/upload/lib.php b/repository/upload/lib.php
index 0c663fc70e3..bce5dcccebf 100644
--- a/repository/upload/lib.php
+++ b/repository/upload/lib.php
@@ -18,7 +18,7 @@
 /**
  * This plugin is used to upload files
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_upload
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -28,7 +28,7 @@ require_once($CFG->dirroot . '/repository/lib.php');
 /**
  * A repository plugin to allow user uploading files
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_upload
  * @copyright  2009 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/url/lib.php b/repository/url/lib.php
index 1fae2524f7a..6b2fc0023e8 100644
--- a/repository/url/lib.php
+++ b/repository/url/lib.php
@@ -18,7 +18,7 @@
 /**
  * This plugin is used to access files by providing an url
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_url
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -30,7 +30,7 @@ require_once(dirname(__FILE__).'/locallib.php');
  * repository_url class
  * A subclass of repository, which is used to download a file from a specific url
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_url
  * @copyright  2009 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/user/lib.php b/repository/user/lib.php
index 31191d61b0d..faaf2f09627 100644
--- a/repository/user/lib.php
+++ b/repository/user/lib.php
@@ -18,7 +18,7 @@
 /**
  * This plugin is used to access user's private files
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_user
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -28,7 +28,7 @@ require_once($CFG->dirroot . '/repository/lib.php');
 /**
  * repository_user class is used to browse user private files
  *
- * @since     2.0
+ * @since     Moodle 2.0
  * @package   repository_user
  * @copyright 2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/webdav/lib.php b/repository/webdav/lib.php
index f5f11901c84..72c27c23d11 100644
--- a/repository/webdav/lib.php
+++ b/repository/webdav/lib.php
@@ -18,7 +18,7 @@
 /**
  * This plugin is used to access webdav files
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_webdav
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -29,7 +29,7 @@ require_once($CFG->libdir.'/webdavlib.php');
 /**
  * repository_webdav class
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_webdav
  * @copyright  2009 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/wikimedia/lib.php b/repository/wikimedia/lib.php
index f48ac179a91..3fcd05540c4 100644
--- a/repository/wikimedia/lib.php
+++ b/repository/wikimedia/lib.php
@@ -18,7 +18,7 @@
 /**
  * This plugin is used to access wikimedia files
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_wikimedia
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -30,7 +30,7 @@ require_once(dirname(__FILE__) . '/wikimedia.php');
  * repository_wikimedia class
  * This is a class used to browse images from wikimedia
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_wikimedia
  * @copyright  2009 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/repository/youtube/lib.php b/repository/youtube/lib.php
index cdf8249f306..b780128c094 100644
--- a/repository/youtube/lib.php
+++ b/repository/youtube/lib.php
@@ -17,7 +17,7 @@
 /**
  * This plugin is used to access youtube videos
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_youtube
  * @copyright  2010 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -27,7 +27,7 @@ require_once($CFG->dirroot . '/repository/lib.php');
 /**
  * repository_youtube class
  *
- * @since 2.0
+ * @since Moodle 2.0
  * @package    repository_youtube
  * @copyright  2009 Dongsheng Cai {@link http://dongsheng.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/webservice/soap/locallib.php b/webservice/soap/locallib.php
index e90c8f12b4b..8ccd31757af 100644
--- a/webservice/soap/locallib.php
+++ b/webservice/soap/locallib.php
@@ -32,7 +32,7 @@ require_once 'Zend/Soap/Server.php';
  * @package    webservice_soap
  * @copyright  2011 Jerome Mouneyrac
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since 2.2
+ * @since Moodle 2.2
  */
 class moodle_zend_soap_server extends Zend_Soap_Server {
 
@@ -155,7 +155,7 @@ class moodle_zend_soap_server extends Zend_Soap_Server {
  * @package    webservice_soap
  * @copyright  2009 Petr Skodak
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since 2.0
+ * @since Moodle 2.0
  */
 class webservice_soap_server extends webservice_zend_server {
 
@@ -305,7 +305,7 @@ class '.$classname.' {
  * @package    webservice_soap
  * @copyright  2009 Petr Skodak
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since 2.0
+ * @since Moodle 2.0
  */
 class webservice_soap_test_client implements webservice_test_client_interface {
 
diff --git a/webservice/xmlrpc/locallib.php b/webservice/xmlrpc/locallib.php
index 3a853116632..c99a21ab2f7 100644
--- a/webservice/xmlrpc/locallib.php
+++ b/webservice/xmlrpc/locallib.php
@@ -32,7 +32,7 @@ require_once 'Zend/XmlRpc/Server.php';
  * @package    webservice_xmlrpc
  * @copyright  2011 Jerome Mouneyrac
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since 2.2
+ * @since Moodle 2.2
  */
 class moodle_zend_xmlrpc_server extends Zend_XmlRpc_Server {
 
@@ -78,7 +78,7 @@ class moodle_zend_xmlrpc_server extends Zend_XmlRpc_Server {
  * @package    webservice_xmlrpc
  * @copyright  2009 Petr Skodak
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since 2.0
+ * @since Moodle 2.0
  */
 class webservice_xmlrpc_server extends webservice_zend_server {
 
@@ -115,7 +115,7 @@ class webservice_xmlrpc_server extends webservice_zend_server {
  * @package    webservice_xmlrpc
  * @copyright  2009 Petr Skodak
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since 2.0
+ * @since Moodle 2.0
  */
 class webservice_xmlrpc_test_client implements webservice_test_client_interface {
     /**