diff --git a/plugin-name/trunk/includes/class-plugin-name-activator.php b/plugin-name/trunk/includes/class-plugin-name-activator.php
index e3d7352..bbe6b76 100644
--- a/plugin-name/trunk/includes/class-plugin-name-activator.php
+++ b/plugin-name/trunk/includes/class-plugin-name-activator.php
@@ -1,12 +1,15 @@
 <?php
 
 /**
- * Short description (no period for file headers)
- *
- * Long description.
+ * Define a short description for what this class does (no period)
  *
  * @package    Plugin_Name
- * @subpackage Plugin_name/includes
+ * @subpackage Plugin_Name/includes
+ * @author     Your Name <email@example.com>
+ * @license    GPL-2.0+
+ * @link       http://example.com
+ * @copyright  2014 Your Name or Company Name
+ * @since      1.0.0
  */
 
 /**
@@ -14,10 +17,9 @@
  *
  * Define a longer description for the purpose of this class.
  *
- * @author    Your Name <email@example.com>
- * @license   GPL-2.0+
- * @link      http://example.com
- * @copyright 2014 Your Name or Company Name
+ * @package    Plugin_Name
+ * @subpackage Plugin_Name/includes
+ * @author     Your Name <email@example.com>
  */
 class Plugin_Name_Activator {
 
@@ -26,8 +28,7 @@ class Plugin_Name_Activator {
 	 *
 	 * Long description.
 	 *
-	 * @since  x.x.x
-	 * @link   URL
+	 * @since    1.0.0
 	 */
 	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 36b1fa1..90ed870 100644
--- a/plugin-name/trunk/includes/class-plugin-name-deactivator.php
+++ b/plugin-name/trunk/includes/class-plugin-name-deactivator.php
@@ -1,12 +1,15 @@
 <?php
 
 /**
- * Short description (no period for file headers)
- *
- * Long description.
+ * Define a short description for what this class does (no period)
  *
  * @package    Plugin_Name
- * @subpackage Plugin_name/includes
+ * @subpackage Plugin_Name/includes
+ * @author     Your Name <email@example.com>
+ * @license    GPL-2.0+
+ * @link       http://example.com
+ * @copyright  2014 Your Name or Company Name
+ * @since      1.0.0
  */
 
 /**
@@ -14,10 +17,9 @@
  *
  * Define a longer description for the purpose of this class.
  *
- * @author    Your Name <email@example.com>
- * @license   GPL-2.0+
- * @link      http://example.com
- * @copyright 2014 Your Name or Company Name
+ * @package    Plugin_Name
+ * @subpackage Plugin_Name/includes
+ * @author     Your Name <email@example.com>
  */
 class Plugin_Name_Deactivator {
 
@@ -26,6 +28,7 @@ class Plugin_Name_Deactivator {
 	 *
 	 * Long description.
 	 *
+	 * @since    1.0.0
 	 */
 	public static function deactivate() {
 
diff --git a/plugin-name/trunk/includes/class-plugin-name.php b/plugin-name/trunk/includes/class-plugin-name.php
index 7b86811..9bbec62 100644
--- a/plugin-name/trunk/includes/class-plugin-name.php
+++ b/plugin-name/trunk/includes/class-plugin-name.php
@@ -1,36 +1,38 @@
 <?php
 
 /**
- * Short description (no period for file headers)
+ * Define a short description for what this class does (no period)
  *
- * Long description.
+ * @package    Plugin_Name
+ * @subpackage Plugin_Name/includes
+ * @author     Your Name <email@example.com>
+ * @license    GPL-2.0+
+ * @link       http://example.com
+ * @copyright  2014 Your Name or Company Name
+ * @since      1.0.0
+ */
+
+/**
+ * Define a short description for what this class does.
+ *
+ * Define a longer description for the purpose of this class.
  *
  * @package    Plugin_Name
  * @subpackage Plugin_Name/includes
  * @author     Your Name <email@example.com>
  */
-
-/**
- * Short description (no period for file headers)
- *
- * Long description.
- *
- * @author    Your Name <email@example.com>
- * @license   GPL-2.0+
- * @link      http://example.com
- * @copyright 2014 Your Name or Company Name
- */
 class Plugin_Name {
 
 	/**
 	 * This class is used to define common functionality that exists between
-	 * both the dashboard and the public-facing side of the website.
+	 * both the dashboard and the public-facing side of the website. Think
+	 * of this as a shared class.
 	 *
 	 * If any hooks are defined in this class, then they should be defined
 	 * in their respective Loader classes (that is, Plugin_Name_Admin_Loader
-	 * or Plugin_Name_Loader).
+	 * or Plugin_Name_Public_Loader).
 	 *
-	 * An instance of this class should then be passed to the loader
+	 * An instance of this class should then be passed to the loader.
 	 */
 
 }