diff --git a/plugin-name/trunk/includes/class-plugin-name-activator.php b/plugin-name/trunk/includes/class-plugin-name-activator.php
index deaf0e2..e3080de 100644
--- a/plugin-name/trunk/includes/class-plugin-name-activator.php
+++ b/plugin-name/trunk/includes/class-plugin-name-activator.php
@@ -1,30 +1,37 @@
 <?php
 
 /**
- * TODO: Short description (no period for file headers)
+ * @TODO
+ * Short description (no period for file headers)
  *
- * TODO: Long description.
+ * Long description.
  *
- * @package   Plugin_Name
+ * @package   TODO
  * @author    Your Name <email@example.com>
  */
+
+/**
+ * @TODO
+ * Short description (no period for file headers)
+ *
+ * Long description.
+ *
+ * @package   TODO
+ * @author    Your Name <email@example.com>
+ * @license   GPL-2.0+
+ * @link      http://example.com
+ * @copyright 2014 Your Name or Company Name
+ */
 class Plugin_Name_Activator {
 
 	/**
+	 * @TODO
 	 * Short description. (use period)
 	 *
 	 * Long description.
 	 *
-	 * @since x.x.x
-	 * @access (for functions: only use if private)
-	 *
-	 * @see Function/method/class relied on
-	 * @link URL
-	 * @global type $varname Short description.
-	 *
-	 * @param  type $var Description.
-	 * @param  type $var Optional. Description.
-	 * @return type Description.
+	 * @since  x.x.x
+	 * @link   URL
 	 */
 	public static function activate() {
 
diff --git a/plugin-name/trunk/includes/class-plugin-name-deactivator.php b/plugin-name/trunk/includes/class-plugin-name-deactivator.php
index 4d2b881..48d675a 100644
--- a/plugin-name/trunk/includes/class-plugin-name-deactivator.php
+++ b/plugin-name/trunk/includes/class-plugin-name-deactivator.php
@@ -1,33 +1,37 @@
 <?php
 
 /**
- * Short Description (no period for file headers)
+ * @TODO
+ * Short description (no period for file headers)
  *
- * Long Description.
+ * Long description.
  *
- * @link URL
- * @since x.x.x (if available)
+ * @package   TODO
+ * @author    Your Name <email@example.com>
+ */
+
+/**
+ * @TODO
+ * Short description (no period for file headers)
  *
- * @package WordPress
- * @subpackage Component
+ * Long description.
+ *
+ * @package   TODO
+ * @author    Your Name <email@example.com>
+ * @license   GPL-2.0+
+ * @link      http://example.com
+ * @copyright 2014 Your Name or Company Name
  */
 class Plugin_Name_Deactivator {
 
 	/**
-	 * TODO: Short description. (use period)
+	 * @TODO
+	 * Short description. (use period)
 	 *
-	 * TODO: Long description.
+	 * Long description.
 	 *
-	 * @since x.x.x
-	 *
-	 * @param type $var Description.
-	 * @param array $args {
-	 *     Short description about this hash.
-	 *
-	 *     @type type $var Description.
-	 *     @type type $var Description.
-	 * }
-	 * @param type $var Description.
+	 * @since   x.x.x
+	 * @link   URL
 	 */
 	public static function deactivate() {