diff --git a/plugin-name/class-plugin-name.php b/plugin-name/class-plugin-name.php
index eba8267..8d6111a 100644
--- a/plugin-name/class-plugin-name.php
+++ b/plugin-name/class-plugin-name.php
@@ -2,7 +2,7 @@
 /**
  * Plugin Name.
  *
- * @package   PluginName
+ * @package   Plugin_Name
  * @author    Your Name <email@example.com>
  * @license   GPL-2.0+
  * @link      http://example.com
@@ -14,10 +14,10 @@
  *
  * TODO: Rename this class to a proper name for your plugin.
  *
- * @package PluginName
+ * @package Plugin_Name
  * @author  Your Name <email@example.com>
  */
-class PluginName {
+class Plugin_Name {
 
 	/**
 	 * Plugin version, used for cache-busting of style and script file references.
diff --git a/plugin-name/plugin-name.php b/plugin-name/plugin-name.php
index 6f8db5a..8b0e73b 100644
--- a/plugin-name/plugin-name.php
+++ b/plugin-name/plugin-name.php
@@ -5,7 +5,7 @@
  * A foundation off of which to build well-documented WordPress plugins that also follow
  * WordPress coding standards and PHP best practices.
  *
- * @package   PluginName
+ * @package   Plugin_Name
  * @author    Your Name <email@example.com>
  * @license   GPL-2.0+
  * @link      http://example.com
@@ -33,9 +33,9 @@ if ( ! defined( 'WPINC' ) ) {
 require_once( plugin_dir_path( __FILE__ ) . 'class-plugin-name.php' );
 
 // Register hooks that are fired when the plugin is activated, deactivated, and uninstalled, respectively.
-// TODO: replace PluginName with the name of the plugin defined in `class-plugin-name.php`
-register_activation_hook( __FILE__, array( 'PluginName', 'activate' ) );
-register_deactivation_hook( __FILE__, array( 'PluginName', 'deactivate' ) );
+// TODO: replace Plugin_Name with the name of the plugin defined in `class-plugin-name.php`
+register_activation_hook( __FILE__, array( 'Plugin_Name', 'activate' ) );
+register_deactivation_hook( __FILE__, array( 'Plugin_Name', 'deactivate' ) );
 
-// TODO: replace PluginName with the name of the plugin defined in `class-plugin-name.php`
-PluginName::get_instance();
\ No newline at end of file
+// TODO: replace Plugin_Name with the name of the plugin defined in `class-plugin-name.php`
+Plugin_Name::get_instance();
\ No newline at end of file
diff --git a/plugin-name/uninstall.php b/plugin-name/uninstall.php
index d8ed8d4..338a967 100644
--- a/plugin-name/uninstall.php
+++ b/plugin-name/uninstall.php
@@ -2,7 +2,7 @@
 /**
  * Fired when the plugin is uninstalled.
  *
- * @package   PluginName
+ * @package   Plugin_Name
  * @author    Your Name <email@example.com>
  * @license   GPL-2.0+
  * @link      http://example.com
diff --git a/plugin-name/views/admin.php b/plugin-name/views/admin.php
index 865ed2b..b47e437 100644
--- a/plugin-name/views/admin.php
+++ b/plugin-name/views/admin.php
@@ -5,7 +5,7 @@
  * This includes the header, options, and other information that should provide
  * The User Interface to the end user.
  *
- * @package   PluginName
+ * @package   Plugin_Name
  * @author    Your Name <email@example.com>
  * @license   GPL-2.0+
  * @link      http://example.com
diff --git a/plugin-name/views/public.php b/plugin-name/views/public.php
index fdd4d80..c8dfa94 100644
--- a/plugin-name/views/public.php
+++ b/plugin-name/views/public.php
@@ -5,7 +5,7 @@
  * This typically includes any information, if any, that is rendered to the
  * frontend of the theme when the plugin is activated.
  *
- * @package   PluginName
+ * @package   Plugin_Name
  * @author    Your Name <email@example.com>
  * @license   GPL-2.0+
  * @link      http://example.com