diff --git a/code/controller/TranslatableCMSMainExtension.php b/code/controller/TranslatableCMSMainExtension.php
index e7dfcbe..8fd074d 100644
--- a/code/controller/TranslatableCMSMainExtension.php
+++ b/code/controller/TranslatableCMSMainExtension.php
@@ -1,4 +1,7 @@
 <?php
+/**
+ * @package translatable
+ */
 class TranslatableCMSMainExtension extends Extension {
 
 	function extraStatics() {
diff --git a/code/forms/LanguageDropdownField.php b/code/forms/LanguageDropdownField.php
index c2ef796..ec5f551 100755
--- a/code/forms/LanguageDropdownField.php
+++ b/code/forms/LanguageDropdownField.php
@@ -2,8 +2,8 @@
 /**
  * An extension to dropdown field, pre-configured to list languages.
  * The languages already used in the site will be on top.
- * @package forms
- * @subpackage fields-relational
+ * 
+ * @package translatable
  */
 class LanguageDropdownField extends GroupedDropdownField {
 	
diff --git a/code/model/Translatable.php b/code/model/Translatable.php
index 4246609..efb13f9 100755
--- a/code/model/Translatable.php
+++ b/code/model/Translatable.php
@@ -158,8 +158,7 @@
  * @author Michael Gall <michael (at) wakeless (dot) net>
  * @author Bernat Foj Capell <bernat@silverstripe.com>
  * 
- * @package sapphire
- * @subpackage i18n
+ * @package translatable
  */
 class Translatable extends DataObjectDecorator implements PermissionProvider {
 
diff --git a/code/tasks/MigrateTranslatableTask.php b/code/tasks/MigrateTranslatableTask.php
index 19b941c..3cb7d36 100644
--- a/code/tasks/MigrateTranslatableTask.php
+++ b/code/tasks/MigrateTranslatableTask.php
@@ -33,8 +33,7 @@
  * http://mydomain.com/dev/tasks/MigrateTranslatableTask
  * </example>
  * 
- * @package sapphire
- * @subpackage tasks
+ * @package translatable
  */
 class MigrateTranslatableTask extends BuildTask {
 	protected $title = "Migrate Translatable Task";
diff --git a/tests/unit/TranslatableSearchFormTest.php b/tests/unit/TranslatableSearchFormTest.php
index d17e6e8..28b9544 100644
--- a/tests/unit/TranslatableSearchFormTest.php
+++ b/tests/unit/TranslatableSearchFormTest.php
@@ -1,7 +1,6 @@
 <?php
 /**
- * @package sapphire
- * @subpackage testing
+ * @package translatable
  */
 class TranslatableSearchFormTest extends FunctionalTest {
 	
diff --git a/tests/unit/TranslatableSiteConfigTest.php b/tests/unit/TranslatableSiteConfigTest.php
index 33bde9d..e63e97d 100644
--- a/tests/unit/TranslatableSiteConfigTest.php
+++ b/tests/unit/TranslatableSiteConfigTest.php
@@ -1,4 +1,7 @@
 <?php
+/**
+ * @package translatable
+ */
 class TranslatableSiteConfigTest extends SapphireTest {
 	
 	static $fixture_file = 'translatable/tests/unit/TranslatableSiteConfigTest.yml';
diff --git a/tests/unit/TranslatableTest.php b/tests/unit/TranslatableTest.php
index d97eaf4..2d81807 100755
--- a/tests/unit/TranslatableTest.php
+++ b/tests/unit/TranslatableTest.php
@@ -2,8 +2,7 @@
 /**
  * @todo Test Versioned getters
  * 
- * @package sapphire
- * @subpackage tests
+ * @package translatable
  */
 class TranslatableTest extends FunctionalTest {