diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index abf3568b..d563a0fb 100644
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -26,6 +26,7 @@
  * @uses SearchContext
  * 
  * @package cms
+ * @subpackage core
  */
 abstract class ModelAdmin extends LeftAndMain {
 
@@ -250,6 +251,8 @@ abstract class ModelAdmin extends LeftAndMain {
 /**
  * Handles a managed model class and provides default collection filtering behavior.
  *
+ * @package cms
+ * @subpackage core
  */
 class ModelAdmin_CollectionController extends Controller {
 	public $parentController;
@@ -758,6 +761,8 @@ class ModelAdmin_CollectionController extends Controller {
 /**
  * Handles operations on a single record from a managed model.
  * 
+ * @package cms
+ * @subpackage core
  * @todo change the parent controller varname to indicate the model scaffolding functionality in ModelAdmin
  */
 class ModelAdmin_RecordController extends Controller {
diff --git a/tasks/RebuildStaticCacheTask.php b/tasks/RebuildStaticCacheTask.php
index 1da69b10..42460af0 100644
--- a/tasks/RebuildStaticCacheTask.php
+++ b/tasks/RebuildStaticCacheTask.php
@@ -1,6 +1,8 @@
 <?php
-
 /**
+ * @package cms
+ * @subpackage tasks
+ * 
  * @todo Make this use the Task interface once it gets merged back into trunk
  */ 
 class RebuildStaticCacheTask extends Controller {
diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php
index 7bca0b7a..5fea97a9 100644
--- a/tests/CMSMainTest.php
+++ b/tests/CMSMainTest.php
@@ -1,5 +1,8 @@
 <?php
-
+/**
+ * @package cms
+ * @subpackage tests
+ */
 class CMSMainTest extends SapphireTest {
 	static $fixture_file = 'cms/tests/CMSMainTest.yml';
 	
diff --git a/tests/SecurityAdminTest.php b/tests/SecurityAdminTest.php
index d29f2ef8..9e3a41eb 100644
--- a/tests/SecurityAdminTest.php
+++ b/tests/SecurityAdminTest.php
@@ -1,5 +1,8 @@
 <?php
-
+/**
+ * @package cms
+ * @subpackage tests
+ */
 class SecurityAdminTest extends FunctionalTest {
 	static $fixture_file = 'cms/tests/CMSMainTest.yml';