diff --git a/Gruntfile.js b/Gruntfile.js
index 1d96d8e31eaa41a04c45ae6ccd500a7cc11fbd0b..284c0b34c6b6d2c6a2175fc0bf17bc1be76c2996 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -32,8 +32,8 @@ module.exports = function( grunt ) {
 				options: {
 					domainPath: '/languages',
 					exclude: [ '\.git/*', 'bin/*', 'node_modules/*', 'tests/*' ],
-					mainFile: 'redis-user-session-storage.php',
-					potFilename: 'redis-user-session-storage.pot',
+					mainFile: 'wp-redis-user-session-storage.php',
+					potFilename: 'wp-redis-user-session-storage.pot',
 					potHeaders: {
 						poedit: true,
 						'x-poedit-keywordslist': true
diff --git a/composer.json b/composer.json
index 83e178436ae5beb2b51c024d51a7751c580a8316..0d2630636eceef236f01866e5379ca6b7b29e2a2 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-  "name"        : "ethitter/redis-user-session-storage",
+  "name"        : "ethitter/wp-redis-user-session-storage",
   "description" : "Store WordPress session tokens in Redis rather than the usermeta table. Requires the Redis PECL extension.",
   "homepage"    : "https://ethitter.com/",
   "type"        : "wordpress-plugin",
diff --git a/inc/class-activation-deactivation-hooks.php b/inc/class-activation-deactivation-hooks.php
index 33b60b10e7fc021ac067447a9450acca88cead8a..76712090c17ba0005656de4db9cbf728b89f3593 100644
--- a/inc/class-activation-deactivation-hooks.php
+++ b/inc/class-activation-deactivation-hooks.php
@@ -2,7 +2,7 @@
 /**
  * Plugin activation hooks to migrate and clean up data.
  *
- * @package Redis_User_Session_Storage
+ * @package WP_Redis_User_Session_Storage
  */
 
 namespace Redis_User_Session_Storage;
diff --git a/inc/class-plugin.php b/inc/class-plugin.php
index 942b9c377fab510f4c74bfab59820acd662e3a72..6623033a31601b39bc3f0af7b1deb3cc3ab04364 100644
--- a/inc/class-plugin.php
+++ b/inc/class-plugin.php
@@ -2,7 +2,7 @@
 /**
  * Offload session storage to Redis.
  *
- * @package Redis_User_Session_Storage
+ * @package WP_Redis_User_Session_Storage
  */
 
 namespace Redis_User_Session_Storage;
diff --git a/languages/redis-user-session-storage.pot b/languages/wp-redis-user-session-storage.pot
similarity index 94%
rename from languages/redis-user-session-storage.pot
rename to languages/wp-redis-user-session-storage.pot
index 75009fa459e37dd8cd9cdc53aab94cd1bd41ccce..85c94f30a96b3939db69d3c11bad7410a54283c2 100644
--- a/languages/redis-user-session-storage.pot
+++ b/languages/wp-redis-user-session-storage.pot
@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: Redis User Session Storage 0.2\n"
 "Report-Msgid-Bugs-To: "
 "https://wordpress.org/support/plugin/redis-user-session-storage\n"
-"POT-Creation-Date: 2022-07-09 20:23:47+00:00\n"
+"POT-Creation-Date: 2022-07-10 01:18:39+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +25,7 @@ msgstr ""
 "X-Textdomain-Support: yes\n"
 "X-Generator: grunt-wp-i18n 1.0.3\n"
 
-#: redis-user-session-storage.php:90
+#: wp-redis-user-session-storage.php:93
 #. translators: 1: New plugin name, 2: Old plugin name
 msgid ""
 "%1$s: An outdated version of this plugin, %2$s, is active. Please "
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index b8985bb10f91380244117b3be4a452a5cdd2fc93..38f3e9ec3510106cfbf120ca866e6831c736880a 100755
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit bootstrap file
  *
- * @package WP_Revisions_Control
+ * @package WP_Redis_User_Session_Storage
  */
 
 $redis_user_session_storage = getenv( 'WP_TESTS_DIR' );
@@ -23,7 +23,7 @@ require_once $redis_user_session_storage . '/includes/functions.php';
  * Manually load the plugin being tested.
  */
 function redis_user_session_storage_tests_manually_load_plugin() {
-	require dirname( dirname( __FILE__ ) ) . '/redis-user-session-storage.php';
+	require dirname( dirname( __FILE__ ) ) . '/wp-redis-user-session-storage.php';
 }
 tests_add_filter( 'muplugins_loaded', 'redis_user_session_storage_tests_manually_load_plugin' );
 
diff --git a/tests/inc/class-test-plugin.php b/tests/inc/class-test-plugin.php
index c92a1cccbbac4d894191ab844bc61eba16745497..ad216a78bd82e3a6b7d9f9f99ca258beb2be6b11 100755
--- a/tests/inc/class-test-plugin.php
+++ b/tests/inc/class-test-plugin.php
@@ -2,7 +2,7 @@
 /**
  * Test plugin features.
  *
- * @package Redis_User_Session_Storage
+ * @package WP_Redis_User_Session_Storage
  */
 
 namespace Redis_User_Session_Storage\Tests\Inc;
diff --git a/redis-user-session-storage.php b/wp-redis-user-session-storage.php
similarity index 98%
rename from redis-user-session-storage.php
rename to wp-redis-user-session-storage.php
index d2a9ba52d6306f409bf07ba8eb33dedd3b3001c9..aadce9a7d3bc3e77be9bf94ff6b9768eab72cf11 100644
--- a/redis-user-session-storage.php
+++ b/wp-redis-user-session-storage.php
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * @package Redis_User_Session_Storage
+ * @package WP_Redis_User_Session_Storage
  */
 
 namespace Redis_User_Session_Storage;