diff --git a/dist/plugin-manager/class-my-plugin-manager.php b/dist/plugin-manager/class-theme-blvd-plugin-manager.php
similarity index 99%
rename from dist/plugin-manager/class-my-plugin-manager.php
rename to dist/plugin-manager/class-theme-blvd-plugin-manager.php
index bb0bc0e..a48e7b6 100644
--- a/dist/plugin-manager/class-my-plugin-manager.php
+++ b/dist/plugin-manager/class-theme-blvd-plugin-manager.php
@@ -257,7 +257,7 @@ private function set_plugins( $plugins ) {
 			 * Include Theme_Blvd_Plugins class to store
 			 * plugin data.
 			 */
-			require_once( $this->package['directory'] . '/class-theme-blvdplugins.php' );
+			require_once( $this->package['directory'] . '/class-my-plugins.php' );
 
 			// Setup plugins.
 			$this->plugins = new Theme_Blvd_Plugins( $plugins, $this );
@@ -334,7 +334,7 @@ private function set_notices() {
 			 * Include Theme_Blvd_Plugin_Notices class to setup
 			 * and display admin-wide notices, if they're needed.
 			 */
-			require_once( $this->package['directory'] . '/class-theme-blvdplugin-notices.php' );
+			require_once( $this->package['directory'] . '/class-my-plugin-notices.php' );
 
 			// Setup notices.
 			$args = array(
diff --git a/dist/plugin-manager/class-my-plugin-notices.php b/dist/plugin-manager/class-theme-blvd-plugin-notices.php
similarity index 100%
rename from dist/plugin-manager/class-my-plugin-notices.php
rename to dist/plugin-manager/class-theme-blvd-plugin-notices.php
diff --git a/dist/plugin-manager/class-my-plugins.php b/dist/plugin-manager/class-theme-blvd-plugins.php
similarity index 100%
rename from dist/plugin-manager/class-my-plugins.php
rename to dist/plugin-manager/class-theme-blvd-plugins.php
diff --git a/gulpfile.js b/gulpfile.js
index b4855d7..c142667 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,6 +1,7 @@
-var gulp 	= require('gulp'),
-	clean	= require('gulp-clean'),
-	replace = require('gulp-replace');
+var gulp 	    = require('gulp'),
+	clean	    = require('gulp-clean'),
+	replace     = require('gulp-replace'),
+	replaceName = require('gulp-replace-name');
 
 /**
  * Variables used to generate custom
@@ -55,14 +56,13 @@ gulp.task('render-php-files', ['copy'], function() {
 
 	}
 
-
 	return gulp.src('src/plugin-manager/*.php')
 		.pipe(replace('my-text-domain', textDomain))
 		.pipe(replace('my_namespace', namespace))
 		.pipe(replace('_My', classPrefix))
-		.pipe(replace('class-my-', 'class-' + classFilePrefix))
 		.pipe(replace(findMenuSlug, replaceMenuSlug))
 		.pipe(replace(findAddMenu, replaceAddMenu))
+		.pipe(replaceName(/class-my-/g, 'class-' + classFilePrefix + '-'))
     	.pipe(gulp.dest('dist/plugin-manager'));
 
 });
diff --git a/package-lock.json b/package-lock.json
index 4c96e79..f7723dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -772,6 +772,15 @@
         }
       }
     },
+    "gulp-replace-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gulp-replace-name/-/gulp-replace-name-1.0.1.tgz",
+      "integrity": "sha1-4Fp2ZpyhW3OLkrVArKdf4GzFKc8=",
+      "requires": {
+        "gulp-util": "3.0.8",
+        "through2": "2.0.3"
+      }
+    },
     "gulp-util": {
       "version": "3.0.8",
       "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
diff --git a/package.json b/package.json
index ee47a0c..b635cd3 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,13 @@
   "dependencies": {
     "gulp": "latest",
     "gulp-clean": "latest",
-    "gulp-replace": "latest"
+    "gulp-replace": "latest",
+    "gulp-replace-name": "^1.0.1"
+  },
+  "devDependencies": {
+    "gulp": "latest",
+    "gulp-clean": "latest",
+    "gulp-replace": "latest",
+    "gulp-replace-name": "^1.0.1"
   }
 }