diff --git a/cake/console/libs/console_error_handler.php b/cake/console/libs/console_error_handler.php
index e49e3f968..80136bbcf 100644
--- a/cake/console/libs/console_error_handler.php
+++ b/cake/console/libs/console_error_handler.php
@@ -23,7 +23,7 @@ require_once 'console_output.php';
  * Error Handler for Cake console. Does simple printing of the 
  * exception that occurred and the stack trace of the error.
  *
- * @package       cake.console
+ * @package       cake.console.libs
  */
 class ConsoleErrorHandler extends ErrorHandler {
 
diff --git a/cake/console/libs/console_input.php b/cake/console/libs/console_input.php
index 00361e453..8378b2e85 100644
--- a/cake/console/libs/console_input.php
+++ b/cake/console/libs/console_input.php
@@ -19,7 +19,7 @@
 /**
  * Object wrapper for interacting with stdin 
  *
- * @package cake.console
+ * @package cake.console.libs
  */
 class ConsoleInput {
 /**
diff --git a/cake/console/libs/console_input_argument.php b/cake/console/libs/console_input_argument.php
index 5877fca37..263475e9d 100644
--- a/cake/console/libs/console_input_argument.php
+++ b/cake/console/libs/console_input_argument.php
@@ -21,7 +21,7 @@
  * ConsoleOptionParser creates these when you use addArgument()
  *
  * @see ConsoleOptionParser::addArgument()
- * @package cake.console
+ * @package cake.console.libs
  */
 class ConsoleInputArgument {
 /**
diff --git a/cake/console/libs/console_input_option.php b/cake/console/libs/console_input_option.php
index cbcc2179a..3c9049248 100644
--- a/cake/console/libs/console_input_option.php
+++ b/cake/console/libs/console_input_option.php
@@ -22,7 +22,7 @@
  * ConsoleOptionParser creates these when you use addOption()
  *
  * @see ConsoleOptionParser::addOption()
- * @package cake.console
+ * @package cake.console.libs
  */
 class ConsoleInputOption {
 /**
diff --git a/cake/console/libs/console_input_subcommand.php b/cake/console/libs/console_input_subcommand.php
index a8878e937..b2903aec2 100644
--- a/cake/console/libs/console_input_subcommand.php
+++ b/cake/console/libs/console_input_subcommand.php
@@ -22,7 +22,7 @@
  * ConsoleOptionParser creates these when you use addSubcommand()
  *
  * @see ConsoleOptionParser::addSubcommand()
- * @package cake.console
+ * @package cake.console.libs
  */
 class ConsoleInputSubcommand {
 
diff --git a/cake/console/libs/console_option_parser.php b/cake/console/libs/console_option_parser.php
index 17eefe1eb..a96a0759a 100644
--- a/cake/console/libs/console_option_parser.php
+++ b/cake/console/libs/console_option_parser.php
@@ -26,7 +26,7 @@ require_once CONSOLE_LIBS . 'help_formatter.php';
  * for GetOpt compatible option definition.  Provides a builder pattern implementation
  * for creating shell option parsers.
  *
- * @package       cake.console
+ * @package       cake.console.libs
  */
 class ConsoleOptionParser {
 
diff --git a/cake/console/libs/console_output.php b/cake/console/libs/console_output.php
index f9020d411..7d41da4d7 100644
--- a/cake/console/libs/console_output.php
+++ b/cake/console/libs/console_output.php
@@ -41,7 +41,7 @@
  * See ConsoleOutput::styles() to learn more about defining your own styles.  Nested styles are not supported
  * at this time.
  *
- * @package cake.console
+ * @package cake.console.libs
  */
 class ConsoleOutput {
 /**
diff --git a/cake/libs/magic_db.php b/cake/libs/magic_db.php
index 07c3686af..86a91d82d 100644
--- a/cake/libs/magic_db.php
+++ b/cake/libs/magic_db.php
@@ -26,8 +26,7 @@ if (!class_exists('File')) {
 /**
  * A class to parse and use the MagicDb for file type analysis
  *
- * @package       cake.tests
- * @package       cake.tests.cases.libs
+ * @package       cake.libs
  */
 class MagicDb extends Object {
 
@@ -171,8 +170,7 @@ class MagicDb extends Object {
 /**
  * undocumented class
  *
- * @package       cake.tests
- * @package       cake.tests.cases.libs
+ * @package       cake.libs
  */
 class MagicFileResource extends Object{
 
diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
index f2bcda3fd..66859261e 100644
--- a/cake/libs/model/datasources/dbo/dbo_sqlite.php
+++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -22,7 +22,6 @@
  *
  * A DboSource adapter for SQLite 3 using PDO
  *
- * @package datasources
  * @package       cake.libs.model.datasources.dbo
  */
 class DboSqlite extends DboSource {