diff --git a/plugin-name/trunk/includes/class-plugin-name-activator.php b/plugin-name/trunk/includes/class-plugin-name-activator.php
index 0a7cb31..5ea8266 100644
--- a/plugin-name/trunk/includes/class-plugin-name-activator.php
+++ b/plugin-name/trunk/includes/class-plugin-name-activator.php
@@ -1,9 +1,9 @@
 <?php
 
 /**
- * @TODO: Short description (no period for file headers)
+ * TODO: Short description (no period for file headers)
  *
- * @TODO: Long description.
+ * TODO: Long description.
  *
  * @package   Plugin_Name
  * @author    Your Name <email@example.com>
@@ -14,9 +14,9 @@
 class Plugin_Name_Activator {
 
 	/**
-	 * @TODO: Short description. (use period)
+	 * TODO: Short description. (use period)
 	 *
-	 * @TODO: Long description.
+	 * TODO: Long description.
 	 *
 	 * @since x.x.x
 	 *
diff --git a/plugin-name/trunk/includes/class-plugin-name-deactivator.php b/plugin-name/trunk/includes/class-plugin-name-deactivator.php
index d9d8a06..7348cd1 100644
--- a/plugin-name/trunk/includes/class-plugin-name-deactivator.php
+++ b/plugin-name/trunk/includes/class-plugin-name-deactivator.php
@@ -1,9 +1,9 @@
 <?php
 
 /**
- * @TODO: Short description (no period for file headers)
+ * TODO: Short description (no period for file headers)
  *
- * @TODO: Long description.
+ * TODO: Long description.
  *
  * @package   Plugin_Name
  * @author    Your Name <email@example.com>
@@ -14,9 +14,9 @@
 class Plugin_Name_Deactivator {
 
 	/**
-	 * @TODO: Short description. (use period)
+	 * TODO: Short description. (use period)
 	 *
-	 * @TODO: Long description.
+	 * TODO: Long description.
 	 *
 	 * @since x.x.x
 	 *
diff --git a/plugin-name/trunk/plugin-name.php b/plugin-name/trunk/plugin-name.php
index 07e2813..80e4ece 100644
--- a/plugin-name/trunk/plugin-name.php
+++ b/plugin-name/trunk/plugin-name.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @TODO: Short description (no period for file headers)
+ * TODO: Short description (no period for file headers)
  *
- * @TODO: Long description.
+ * TODO: Long description.
  *
  * @package   Plugin_Name
  * @author    Your Name <email@example.com>
@@ -11,12 +11,12 @@
  * @copyright 2014 Your Name or Company Name
  *
  * @wordpress-plugin
- * Plugin Name:       @TODO
- * Plugin URI:        @TODO
- * Description:       @TODO
- * Version:           @TODO
- * Author:            @TODO
- * Author URI:        @TODO
+ * Plugin Name:       TODO
+ * Plugin URI:        TODO
+ * Description:       TODO
+ * Version:           TODO
+ * Author:            TODO
+ * Author URI:        TODO
  * Text Domain:       plugin-name-locale
  * License:           GPL-2.0+
  * License URI:       http://www.gnu.org/licenses/gpl-2.0.txt
diff --git a/plugin-name/trunk/uninstall.php b/plugin-name/trunk/uninstall.php
index 5d80153..dc44302 100644
--- a/plugin-name/trunk/uninstall.php
+++ b/plugin-name/trunk/uninstall.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @TODO: Short description (no period for file headers)
+ * TODO: Short description (no period for file headers)
  *
- * @TODO: Long description.
+ * TODO: Long description.
  *
  * @package   Plugin_Name
  * @author    Your Name <email@example.com>