diff --git a/better-search.php b/better-search.php
index 4295551..1fa0df9 100644
--- a/better-search.php
+++ b/better-search.php
@@ -13,7 +13,7 @@
  * Plugin Name: Better Search
  * Plugin URI:  https://webberzone.com/plugins/better-search/
  * Description: Replace the default WordPress search with a contextual search. Search results are sorted by relevancy ensuring a better visitor search experience.
- * Version:     4.0.0-RC1
+ * Version:     4.0.0-RC2
  * Author:      WebberZone
  * Author URI:  https://webberzone.com/
  * Text Domain: better-search
diff --git a/includes/admin/settings/class-metabox-api.php b/includes/admin/settings/class-metabox-api.php
index d7fa061..9f19f15 100644
--- a/includes/admin/settings/class-metabox-api.php
+++ b/includes/admin/settings/class-metabox-api.php
@@ -298,7 +298,7 @@ public function html( $post ) {
 		echo '</table>';
 
 		/**
-		 * Action triggered when displaying Top 10 meta box.
+		 * Action triggered when displaying Better Search meta box.
 		 *
 		 * @param object $post  Post object.
 		 */
diff --git a/includes/class-main.php b/includes/class-main.php
index 1611aa8..fdf8c8f 100644
--- a/includes/class-main.php
+++ b/includes/class-main.php
@@ -253,7 +253,11 @@ public function plugin_deactivated_notice() {
 		}
 		?>
 			<div class="updated" style="border-left: 4px solid #ffba00;">
-				<p><?php echo esc_html( $message ); ?></p>
+				<p>
+					<?php
+					esc_html_e( $message );
+					?>
+				</p>
 			</div>
 			<?php
 			delete_transient( 'bsearch_deactivated_notice_id' );
diff --git a/includes/class-tracker.php b/includes/class-tracker.php
index a25eee5..c3c800b 100644
--- a/includes/class-tracker.php
+++ b/includes/class-tracker.php
@@ -34,7 +34,7 @@ public function __construct() {
 	}
 
 	/**
-	 * Enqueues the scripts needed by Top 10.
+	 * Enqueues the scripts needed by Better Search.
 	 *
 	 * @since 1.9.7
 	 * @return void
@@ -114,7 +114,7 @@ public static function enqueue_scripts() {
 	 * @since   2.0.0
 	 *
 	 * @param   array $vars   Query variables array.
-	 * @return  array Query variables array with Top 10 parameters appended
+	 * @return  array Query variables array with Better Search parameters appended
 	 */
 	public static function query_vars( $vars ) {
 		// Add these to the list of queryvars that WP gathers.
diff --git a/includes/frontend/class-media-handler.php b/includes/frontend/class-media-handler.php
index 5742e6c..4fc413d 100644
--- a/includes/frontend/class-media-handler.php
+++ b/includes/frontend/class-media-handler.php
@@ -312,7 +312,7 @@ public static function get_the_post_thumbnail( $args = array() ) {
 		}
 
 		/**
-		 * Filters post thumbnail created for Top 10.
+		 * Filters post thumbnail created for Better Search.
 		 *
 		 * @since   1.9.10.1
 		 *
diff --git a/includes/util/class-cache.php b/includes/util/class-cache.php
index 0c81f57..a08830a 100644
--- a/includes/util/class-cache.php
+++ b/includes/util/class-cache.php
@@ -30,7 +30,7 @@ public function __construct() {
 	}
 
 	/**
-	 * Function to clear the Top 10 Cache with Ajax.
+	 * Function to clear the Better Search Cache with Ajax.
 	 *
 	 * @since 3.3.0
 	 */
@@ -51,7 +51,7 @@ public function ajax_clearcache() {
 	}
 
 	/**
-	 * Delete the Top 10 cache.
+	 * Delete the Better Search cache.
 	 *
 	 * @since 3.3.0
 	 *