diff --git a/lib/dml/database_column_info.php b/lib/dml/database_column_info.php
index 6e8001af034..5306c71c1ab 100644
--- a/lib/dml/database_column_info.php
+++ b/lib/dml/database_column_info.php
@@ -19,7 +19,7 @@
 /**
  * Database column information.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2008 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/moodle_database.php b/lib/dml/moodle_database.php
index 4eeae79da49..371cb751211 100644
--- a/lib/dml/moodle_database.php
+++ b/lib/dml/moodle_database.php
@@ -19,7 +19,7 @@
 /**
  * Abstract database driver class.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2008 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/moodle_recordset.php b/lib/dml/moodle_recordset.php
index 3714719e8df..120dc35850d 100644
--- a/lib/dml/moodle_recordset.php
+++ b/lib/dml/moodle_recordset.php
@@ -19,7 +19,7 @@
 /**
  * Abstract recordset.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2008 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/moodle_temptables.php b/lib/dml/moodle_temptables.php
index 0fe35f7b039..f425164c6bb 100644
--- a/lib/dml/moodle_temptables.php
+++ b/lib/dml/moodle_temptables.php
@@ -35,7 +35,7 @@
  * Only drivers needing it will use this store. Neither moodle_database (abstract) or
  * databases like postgres need this, because they don't lack any temp functionality.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2009 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/moodle_transaction.php b/lib/dml/moodle_transaction.php
index 319a95ecf98..33bfadbf85c 100644
--- a/lib/dml/moodle_transaction.php
+++ b/lib/dml/moodle_transaction.php
@@ -19,7 +19,7 @@
 /**
  * Delegated database transaction support.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2009 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/mssql_native_moodle_database.php b/lib/dml/mssql_native_moodle_database.php
index c5ea1b5b0cf..8114a7f3d3c 100644
--- a/lib/dml/mssql_native_moodle_database.php
+++ b/lib/dml/mssql_native_moodle_database.php
@@ -19,7 +19,7 @@
 /**
  * Native mssql class representing moodle database interface.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2009 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/mssql_native_moodle_recordset.php b/lib/dml/mssql_native_moodle_recordset.php
index 38bfc0a01a0..d5f3481a88f 100644
--- a/lib/dml/mssql_native_moodle_recordset.php
+++ b/lib/dml/mssql_native_moodle_recordset.php
@@ -18,7 +18,7 @@
 /**
  * MSSQL specific recordset.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2009 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/mssql_native_moodle_temptables.php b/lib/dml/mssql_native_moodle_temptables.php
index d1418e6f26f..b598503f374 100644
--- a/lib/dml/mssql_native_moodle_temptables.php
+++ b/lib/dml/mssql_native_moodle_temptables.php
@@ -20,7 +20,7 @@
  * are named differently than normal tables. Also used to be able to retrieve
  * temp table names included in the get_tables() method of the DB.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2009 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/mysqli_native_moodle_database.php b/lib/dml/mysqli_native_moodle_database.php
index 65d90e38976..4a4090ae9ff 100644
--- a/lib/dml/mysqli_native_moodle_database.php
+++ b/lib/dml/mysqli_native_moodle_database.php
@@ -19,7 +19,7 @@
 /**
  * Native mysqli class representing moodle database interface.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2008 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/mysqli_native_moodle_recordset.php b/lib/dml/mysqli_native_moodle_recordset.php
index 0df8808aec2..fae00433247 100644
--- a/lib/dml/mysqli_native_moodle_recordset.php
+++ b/lib/dml/mysqli_native_moodle_recordset.php
@@ -19,7 +19,7 @@
 /**
  * Mysqli specific recordset.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2008 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/mysqli_native_moodle_temptables.php b/lib/dml/mysqli_native_moodle_temptables.php
index cbedf637393..595082ed806 100644
--- a/lib/dml/mysqli_native_moodle_temptables.php
+++ b/lib/dml/mysqli_native_moodle_temptables.php
@@ -20,7 +20,7 @@
  * are named differently than normal tables. Also used to be able to retrieve
  * temp table names included in the get_tables() method of the DB.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2009 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/oci_native_moodle_database.php b/lib/dml/oci_native_moodle_database.php
index 75a3677411e..4b77ad02e4e 100644
--- a/lib/dml/oci_native_moodle_database.php
+++ b/lib/dml/oci_native_moodle_database.php
@@ -19,7 +19,7 @@
 /**
  * Native oci class representing moodle database interface.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2008 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/oci_native_moodle_recordset.php b/lib/dml/oci_native_moodle_recordset.php
index 1434c260d66..ed1112b49d8 100644
--- a/lib/dml/oci_native_moodle_recordset.php
+++ b/lib/dml/oci_native_moodle_recordset.php
@@ -19,7 +19,7 @@
 /**
  * Oracle specific recordset.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2008 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/oci_native_moodle_temptables.php b/lib/dml/oci_native_moodle_temptables.php
index 4ce8211854f..3c2a6571c83 100644
--- a/lib/dml/oci_native_moodle_temptables.php
+++ b/lib/dml/oci_native_moodle_temptables.php
@@ -22,7 +22,7 @@
  * Also used to be able to retrieve temp table names included in the get_tables()
  * method of the DB.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2009 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/pdo_moodle_database.php b/lib/dml/pdo_moodle_database.php
index 8bcaecb0149..aedd6e78eb3 100644
--- a/lib/dml/pdo_moodle_database.php
+++ b/lib/dml/pdo_moodle_database.php
@@ -19,7 +19,7 @@
 /**
  * Experimental pdo database class
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2008 Andrei Bautu
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/pdo_moodle_recordset.php b/lib/dml/pdo_moodle_recordset.php
index 4848da7b797..64be1bd1b19 100644
--- a/lib/dml/pdo_moodle_recordset.php
+++ b/lib/dml/pdo_moodle_recordset.php
@@ -19,7 +19,7 @@
 /**
  * Experimental pdo recordset
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2008 Andrei Bautu
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/pgsql_native_moodle_database.php b/lib/dml/pgsql_native_moodle_database.php
index 7b8218b37f5..3e7ef7af742 100644
--- a/lib/dml/pgsql_native_moodle_database.php
+++ b/lib/dml/pgsql_native_moodle_database.php
@@ -19,7 +19,7 @@
 /**
  * Native pgsql class representing moodle database interface.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2008 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/pgsql_native_moodle_recordset.php b/lib/dml/pgsql_native_moodle_recordset.php
index a2640f6812b..70d655e132f 100644
--- a/lib/dml/pgsql_native_moodle_recordset.php
+++ b/lib/dml/pgsql_native_moodle_recordset.php
@@ -19,7 +19,7 @@
 /**
  * Native postgresql recordset.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2008 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/pgsql_native_moodle_temptables.php b/lib/dml/pgsql_native_moodle_temptables.php
index 0ced452267f..c58bf4baced 100644
--- a/lib/dml/pgsql_native_moodle_temptables.php
+++ b/lib/dml/pgsql_native_moodle_temptables.php
@@ -20,7 +20,7 @@
  * are named differently than normal tables. Also used to be able to retrieve
  * temp table names included in the get_tables() method of the DB.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/sqlite3_pdo_moodle_database.php b/lib/dml/sqlite3_pdo_moodle_database.php
index 47070bc0d1a..e1792af8982 100644
--- a/lib/dml/sqlite3_pdo_moodle_database.php
+++ b/lib/dml/sqlite3_pdo_moodle_database.php
@@ -19,7 +19,7 @@
 /**
  * Experimental pdo database class.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2008 Andrei Bautu
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/dml/sqlsrv_native_moodle_database.php b/lib/dml/sqlsrv_native_moodle_database.php
index 6f58e62880a..4c17ec9108e 100644
--- a/lib/dml/sqlsrv_native_moodle_database.php
+++ b/lib/dml/sqlsrv_native_moodle_database.php
@@ -18,7 +18,7 @@
 /**
  * Native sqlsrv class representing moodle database interface.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2009 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v2 or later
diff --git a/lib/dml/sqlsrv_native_moodle_recordset.php b/lib/dml/sqlsrv_native_moodle_recordset.php
index bfa5ac90ab4..815bfedb225 100644
--- a/lib/dml/sqlsrv_native_moodle_recordset.php
+++ b/lib/dml/sqlsrv_native_moodle_recordset.php
@@ -18,7 +18,7 @@
 /**
  * sqlsrv specific recorset.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2009 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v2 or later
diff --git a/lib/dml/sqlsrv_native_moodle_temptables.php b/lib/dml/sqlsrv_native_moodle_temptables.php
index 6043f5b7626..461976903ce 100644
--- a/lib/dml/sqlsrv_native_moodle_temptables.php
+++ b/lib/dml/sqlsrv_native_moodle_temptables.php
@@ -20,7 +20,7 @@
  * are named differently than normal tables. Also used to be able to retrieve
  * temp table names included in the get_tables() method of the DB.
  *
- * @package    code
+ * @package    core
  * @subpackage dml
  * @copyright  2009 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v2 or later