diff --git a/README.md b/README.md
index 722e976..f2e0f66 100644
--- a/README.md
+++ b/README.md
@@ -30,8 +30,8 @@ Now are using the https://github.com/x3p0-dev/x3p0-ideas/tree/block-example exma
 /**
  * Add the dependency for the call
  */
-    if ( class_exists( 'AcrossWP_BuddyPress_BuddyBoss_Platform_Dependency' ) ) {
-        new AcrossWP_BuddyPress_BuddyBoss_Platform_Dependency( $this->get_plugin_name(), WORDPRESS_PLUGIN_BOILERPLATE_FILES );
+    if ( class_exists( 'WPBoilerplate_BuddyPress_BuddyBoss_Platform_Dependency' ) ) {
+        new WPBoilerplate_BuddyPress_BuddyBoss_Platform_Dependency( $this->get_plugin_name(), WORDPRESS_PLUGIN_BOILERPLATE_FILES );
     }
 ```
 
diff --git a/admin/class-wordpress-plugin-boilerplate-admin.php b/admin/class-wordpress-plugin-boilerplate-admin.php
index 748f3c3..c5a79b1 100644
--- a/admin/class-wordpress-plugin-boilerplate-admin.php
+++ b/admin/class-wordpress-plugin-boilerplate-admin.php
@@ -20,7 +20,7 @@
  *
  * @package    Wordpress_Plugin_Boilerplate
  * @subpackage Wordpress_Plugin_Boilerplate/admin
- * @author     AcrossWP <contact@acrosswp.com>
+ * @author     WPBoilerplate <contact@acrosswp.com>
  */
 class Wordpress_Plugin_Boilerplate_Admin {
 
diff --git a/admin/licenses-update/edd/main.php b/admin/licenses-update/edd/main.php
index a985ee2..46eb5ad 100644
--- a/admin/licenses-update/edd/main.php
+++ b/admin/licenses-update/edd/main.php
@@ -3,7 +3,7 @@
 defined( 'ABSPATH' ) || exit;
 
 /**
- * Add EDD licences into the AcrossWP EDD licences menu
+ * Add EDD licences into the WPBoilerplate EDD licences menu
  */
 function wordpress_plugin_boilerplate_edd_plugins_licenses( $licenses ) {
 
diff --git a/admin/licenses-update/plugin-update-checker/main.php b/admin/licenses-update/plugin-update-checker/main.php
index e9640f2..e2a98b8 100644
--- a/admin/licenses-update/plugin-update-checker/main.php
+++ b/admin/licenses-update/plugin-update-checker/main.php
@@ -3,7 +3,7 @@
 defined( 'ABSPATH' ) || exit;
 
 /**
- * Add Github Plugin update checker into the AcrossWP Github Plugin Update Checker
+ * Add Github Plugin update checker into the WPBoilerplate Github Plugin Update Checker
  */
 function wordpress_plugin_boilerplate_plugins_update_checker_github( $packages ) {
 
diff --git a/admin/update/wordpress-plugin-boilerplate-update.php b/admin/update/wordpress-plugin-boilerplate-update.php
index d7a3753..1718e73 100644
--- a/admin/update/wordpress-plugin-boilerplate-update.php
+++ b/admin/update/wordpress-plugin-boilerplate-update.php
@@ -18,7 +18,7 @@
  *
  * @package    Wordpress_Plugin_Boilerplate
  * @subpackage Wordpress_Plugin_Boilerplate/Updater
- * @author     AcrossWP <contact@acrosswp.com>
+ * @author     WPBoilerplate <contact@acrosswp.com>
  */
 class Wordpress_Plugin_Boilerplate_Update {
 
diff --git a/includes/class-wordpress-plugin-boilerplate-activator.php b/includes/class-wordpress-plugin-boilerplate-activator.php
index fc52561..ed791f0 100644
--- a/includes/class-wordpress-plugin-boilerplate-activator.php
+++ b/includes/class-wordpress-plugin-boilerplate-activator.php
@@ -20,7 +20,7 @@
  * @since      1.0.0
  * @package    Wordpress_Plugin_Boilerplate
  * @subpackage Wordpress_Plugin_Boilerplate/includes
- * @author     AcrossWP <contact@acrosswp.com>
+ * @author     WPBoilerplate <contact@acrosswp.com>
  */
 class Wordpress_Plugin_Boilerplate_Activator {
 
diff --git a/includes/class-wordpress-plugin-boilerplate-deactivator.php b/includes/class-wordpress-plugin-boilerplate-deactivator.php
index be23fdf..473507a 100644
--- a/includes/class-wordpress-plugin-boilerplate-deactivator.php
+++ b/includes/class-wordpress-plugin-boilerplate-deactivator.php
@@ -20,7 +20,7 @@
  * @since      1.0.0
  * @package    Wordpress_Plugin_Boilerplate
  * @subpackage Wordpress_Plugin_Boilerplate/includes
- * @author     AcrossWP <contact@acrosswp.com>
+ * @author     WPBoilerplate <contact@acrosswp.com>
  */
 class Wordpress_Plugin_Boilerplate_Deactivator {
 
diff --git a/includes/class-wordpress-plugin-boilerplate-i18n.php b/includes/class-wordpress-plugin-boilerplate-i18n.php
index 5018db1..d0dcd18 100644
--- a/includes/class-wordpress-plugin-boilerplate-i18n.php
+++ b/includes/class-wordpress-plugin-boilerplate-i18n.php
@@ -24,7 +24,7 @@
  * @since      1.0.0
  * @package    Wordpress_Plugin_Boilerplate
  * @subpackage Wordpress_Plugin_Boilerplate/includes
- * @author     AcrossWP <contact@acrosswp.com>
+ * @author     WPBoilerplate <contact@acrosswp.com>
  */
 class Wordpress_Plugin_Boilerplate_i18n {
 
diff --git a/includes/class-wordpress-plugin-boilerplate-loader.php b/includes/class-wordpress-plugin-boilerplate-loader.php
index 7e5b4a1..265f451 100644
--- a/includes/class-wordpress-plugin-boilerplate-loader.php
+++ b/includes/class-wordpress-plugin-boilerplate-loader.php
@@ -21,7 +21,7 @@
  *
  * @package    Wordpress_Plugin_Boilerplate
  * @subpackage Wordpress_Plugin_Boilerplate/includes
- * @author     AcrossWP <contact@acrosswp.com>
+ * @author     WPBoilerplate <contact@acrosswp.com>
  */
 class Wordpress_Plugin_Boilerplate_Loader {
 
diff --git a/includes/class-wordpress-plugin-boilerplate.php b/includes/class-wordpress-plugin-boilerplate.php
index cbf38a1..e638110 100644
--- a/includes/class-wordpress-plugin-boilerplate.php
+++ b/includes/class-wordpress-plugin-boilerplate.php
@@ -27,7 +27,7 @@
  * @since      1.0.0
  * @package    Wordpress_Plugin_Boilerplate
  * @subpackage Wordpress_Plugin_Boilerplate/includes
- * @author     AcrossWP <contact@acrosswp.com>
+ * @author     WPBoilerplate <contact@acrosswp.com>
  */
 final class Wordpress_Plugin_Boilerplate {
 	
@@ -194,8 +194,8 @@ private function load_dependencies() {
 		/**
 		 * Add the dependency for the call
 		 */
-		if ( class_exists( 'AcrossWP_BuddyPress_BuddyBoss_Platform_Dependency' ) ) {
-			new AcrossWP_BuddyPress_BuddyBoss_Platform_Dependency( $this->get_plugin_name(), WORDPRESS_PLUGIN_BOILERPLATE_FILES );
+		if ( class_exists( 'WPBoilerplate_BuddyPress_BuddyBoss_Platform_Dependency' ) ) {
+			new WPBoilerplate_BuddyPress_BuddyBoss_Platform_Dependency( $this->get_plugin_name(), WORDPRESS_PLUGIN_BOILERPLATE_FILES );
 		}
 
 		/**
diff --git a/init-plugin.sh b/init-plugin.sh
index 32e8de8..96fce75 100644
--- a/init-plugin.sh
+++ b/init-plugin.sh
@@ -48,7 +48,7 @@ repo="$slug"
 
 echo
 echo "The Organization name will be converted to lowercase for use in the repository "
-echo "path (i.e. AcrossWP becomes acrosswp)."
+echo "path (i.e. WPBoilerplate becomes acrosswp)."
 echo -n "Enter your GitHub organization name, and press [ENTER]: "
 read org
 
diff --git a/package.json b/package.json
index a4c57a3..d3f0bd2 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "wordpress-plugin-boilerplate",
   "title": "WordPress Plugin Boilerplate",
-  "description": "WordPress Plugin Boilerplate by AcrossWP.",
+  "description": "WordPress Plugin Boilerplate by WPBoilerplate.",
   "homepage": "https://github.com/woocommerce/woocommerce/wiki",
   "private": true,
   "repository": {
     "type": "git",
     "url": "git+https://github.com/acrosswp/wordpress-plugin-boilerplate.git"
   },
-  "author": "AcrossWP",
+  "author": "WPBoilerplate",
   "license": "GPL-3.0-or-later",
   "bugs": {
     "url": "https://github.com/acrosswp/wordpress-plugin-boilerplate/issues"
diff --git a/public/class-wordpress-plugin-boilerplate-public.php b/public/class-wordpress-plugin-boilerplate-public.php
index 8529c4c..99b2256 100644
--- a/public/class-wordpress-plugin-boilerplate-public.php
+++ b/public/class-wordpress-plugin-boilerplate-public.php
@@ -20,7 +20,7 @@
  *
  * @package    Wordpress_Plugin_Boilerplate
  * @subpackage Wordpress_Plugin_Boilerplate/public
- * @author     AcrossWP <contact@acrosswp.com>
+ * @author     WPBoilerplate <contact@acrosswp.com>
  */
 class Wordpress_Plugin_Boilerplate_Public {
 
diff --git a/wordpress-plugin-boilerplate.php b/wordpress-plugin-boilerplate.php
index 0818c0e..bb9988b 100644
--- a/wordpress-plugin-boilerplate.php
+++ b/wordpress-plugin-boilerplate.php
@@ -15,9 +15,9 @@
  * @wordpress-plugin
  * Plugin Name:       WordPress Plugin Boilerplate
  * Plugin URI:        https://acrosswp.com
- * Description:       WordPress Plugin Boilerplate by AcrossWP
+ * Description:       WordPress Plugin Boilerplate by WPBoilerplate
  * Version:           1.0.0
- * Author:            AcrossWP
+ * Author:            WPBoilerplate
  * Author URI:        https://acrosswp.com
  * License:           GPL-2.0+
  * License URI:       http://www.gnu.org/licenses/gpl-2.0.txt