diff --git a/plugin-name/trunk/includes/class-plugin-name-activator.php b/plugin-name/trunk/includes/class-plugin-name-activator.php
index 91e77bf..e3d7352 100644
--- a/plugin-name/trunk/includes/class-plugin-name-activator.php
+++ b/plugin-name/trunk/includes/class-plugin-name-activator.php
@@ -5,16 +5,15 @@
  *
  * Long description.
  *
- * @package   TODO
- * @author    Your Name <email@example.com>
+ * @package    Plugin_Name
+ * @subpackage Plugin_name/includes
  */
 
 /**
- * Short description (no period for file headers)
+ * Define a short description for what this class does.
  *
- * Long description.
+ * Define a longer description for the purpose of this class.
  *
- * @package   TODO
  * @author    Your Name <email@example.com>
  * @license   GPL-2.0+
  * @link      http://example.com
diff --git a/plugin-name/trunk/includes/class-plugin-name-deactivator.php b/plugin-name/trunk/includes/class-plugin-name-deactivator.php
index 3c0abef..36b1fa1 100644
--- a/plugin-name/trunk/includes/class-plugin-name-deactivator.php
+++ b/plugin-name/trunk/includes/class-plugin-name-deactivator.php
@@ -5,16 +5,15 @@
  *
  * Long description.
  *
- * @package   TODO
- * @author    Your Name <email@example.com>
+ * @package    Plugin_Name
+ * @subpackage Plugin_name/includes
  */
 
 /**
- * Short description (no period for file headers)
+ * Define a short description for what this class does.
  *
- * Long description.
+ * Define a longer description for the purpose of this class.
  *
- * @package   TODO
  * @author    Your Name <email@example.com>
  * @license   GPL-2.0+
  * @link      http://example.com
@@ -27,8 +26,6 @@ class Plugin_Name_Deactivator {
 	 *
 	 * Long description.
 	 *
-	 * @since   x.x.x
-	 * @link   URL
 	 */
 	public static function deactivate() {