diff --git a/plugin-name/trunk/plugin-name.php b/plugin-name/trunk/plugin-name.php
index d29e150..10a08cd 100644
--- a/plugin-name/trunk/plugin-name.php
+++ b/plugin-name/trunk/plugin-name.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * TODO: Short description (no period for file headers)
+ * Short Description (no period for file headers)
  *
- * TODO: Long description.
+ * Long Description.
  *
- * @package   Plugin_Name
- * @author    Your Name <email@example.com>
- * @license   GPL-2.0+
- * @link      http://example.com
- * @copyright 2014 Your Name or Company Name
+ * @link URL
+ * @since x.x.x (if available)
+ *
+ * @package WordPress
+ * @subpackage Component
  *
  * @wordpress-plugin
  * Plugin Name:       TODO
diff --git a/plugin-name/trunk/uninstall.php b/plugin-name/trunk/uninstall.php
index 55f8bfd..378c2ce 100644
--- a/plugin-name/trunk/uninstall.php
+++ b/plugin-name/trunk/uninstall.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * TODO: Short description (no period for file headers)
+ * Short Description (no period for file headers)
  *
- * TODO: Long description.
+ * Long Description.
  *
- * @package   Plugin_Name
- * @author    Your Name <email@example.com>
- * @license   GPL-2.0+
- * @link      http://example.com
- * @copyright 2014 Your Name or Company Name
+ * @link URL
+ * @since x.x.x (if available)
+ *
+ * @package WordPress
+ * @subpackage Component
  */
 
 // If uninstall not called from WordPress, then exit.