diff --git a/assets/javascripts/discourse/initializers/decrypt-post-revision.js b/assets/javascripts/discourse/initializers/decrypt-post-revision.js
index 25e2eb44..9441eb33 100644
--- a/assets/javascripts/discourse/initializers/decrypt-post-revision.js
+++ b/assets/javascripts/discourse/initializers/decrypt-post-revision.js
@@ -20,7 +20,7 @@ export default {
 
     withPluginApi("0.11.3", (api) => {
       api.modifyClassStatic("model:post", {
-        pluginId: "discourse-encrypt",
+        pluginId: "decrypt-post-revisions",
 
         loadRevision() {
           return this._super(...arguments).then((result) => {
diff --git a/assets/javascripts/discourse/initializers/encrypt-composer.js b/assets/javascripts/discourse/initializers/encrypt-composer.js
index 756d7f72..3ba776c7 100644
--- a/assets/javascripts/discourse/initializers/encrypt-composer.js
+++ b/assets/javascripts/discourse/initializers/encrypt-composer.js
@@ -36,7 +36,7 @@ export default {
     withPluginApi("0.11.3", (api) => {
       // Check recipients and show encryption status in composer.
       api.modifyClass("model:composer", {
-        pluginId: "discourse-encrypt",
+        pluginId: "encrypt-composer",
 
         @on("init")
         @observes("creatingPrivateMessage", "topic")
diff --git a/assets/javascripts/discourse/initializers/hook-topic-controller.js b/assets/javascripts/discourse/initializers/encrypt-delete-topic.js
similarity index 98%
rename from assets/javascripts/discourse/initializers/hook-topic-controller.js
rename to assets/javascripts/discourse/initializers/encrypt-delete-topic.js
index a808bb15..e1f5b52b 100644
--- a/assets/javascripts/discourse/initializers/hook-topic-controller.js
+++ b/assets/javascripts/discourse/initializers/encrypt-delete-topic.js
@@ -4,12 +4,12 @@ import Post from "discourse/models/post";
 import I18n from "I18n";
 
 export default {
-  name: "hook-topic-controller",
+  name: "encrypt-delete-topic",
 
   initialize() {
     withPluginApi("0.11.3", (api) => {
       api.modifyClass("controller:topic", {
-        pluginId: "discourse-encrypt",
+        pluginId: "encrypt-delete-topic",
 
         permanentDeleteConfirmation(callback) {
           bootbox.confirm(
diff --git a/assets/javascripts/discourse/initializers/encrypt-drafts.js b/assets/javascripts/discourse/initializers/encrypt-drafts.js
index 2e047194..761ff159 100644
--- a/assets/javascripts/discourse/initializers/encrypt-drafts.js
+++ b/assets/javascripts/discourse/initializers/encrypt-drafts.js
@@ -55,7 +55,7 @@ export default {
 
     withPluginApi("0.11.3", (api) => {
       api.modifyClassStatic("model:draft", {
-        pluginId: "discourse-encrypt",
+        pluginId: "encrypt-drafts",
 
         save(draftKey, sequence, data, clientId) {
           // TODO: https://github.com/emberjs/ember.js/issues/15291
@@ -118,7 +118,7 @@ export default {
       });
 
       api.modifyClass("model:user-drafts-stream", {
-        pluginId: "discourse-encrypt",
+        pluginId: "encrypt-drafts",
 
         findItems(site) {
           return this._super(site).then(() => {
diff --git a/assets/javascripts/discourse/initializers/encrypt-posts.js b/assets/javascripts/discourse/initializers/encrypt-posts.js
index f0fbab7d..40067085 100644
--- a/assets/javascripts/discourse/initializers/encrypt-posts.js
+++ b/assets/javascripts/discourse/initializers/encrypt-posts.js
@@ -62,7 +62,7 @@ export default {
 
     withPluginApi("0.11.3", (api) => {
       api.modifyClassStatic("model:topic", {
-        pluginId: "discourse-encrypt",
+        pluginId: "encrypt-posts",
 
         update(topic, props) {
           // TODO: https://github.com/emberjs/ember.js/issues/15291
@@ -82,7 +82,7 @@ export default {
       });
 
       api.modifyClass("adapter:post", {
-        pluginId: "discourse-encrypt",
+        pluginId: "encrypt-posts",
 
         createRecord(store, type, args) {
           // TODO: https://github.com/emberjs/ember.js/issues/15291
diff --git a/assets/javascripts/discourse/initializers/fetch-encrypt-keys.js b/assets/javascripts/discourse/initializers/fetch-encrypt-keys.js
index b824363a..4a2b812f 100644
--- a/assets/javascripts/discourse/initializers/fetch-encrypt-keys.js
+++ b/assets/javascripts/discourse/initializers/fetch-encrypt-keys.js
@@ -85,7 +85,7 @@ export default {
 
     withPluginApi("0.11.3", (api) => {
       api.modifyClass("adapter:notification", {
-        pluginId: "discourse-encrypt",
+        pluginId: "fetch-encrypt-keys",
 
         find() {
           return this._super(...arguments).then((result) => {
@@ -104,7 +104,7 @@ export default {
       });
 
       api.modifyClassStatic("model:topic", {
-        pluginId: "discourse-encrypt",
+        pluginId: "fetch-encrypt-keys",
 
         create(args) {
           if (args && args.topic_key) {
@@ -116,7 +116,7 @@ export default {
       });
 
       api.modifyClass("model:topic", {
-        pluginId: "discourse-encrypt",
+        pluginId: "fetch-encrypt-keys",
 
         updateFromJson(json) {
           if (json.topic_key) {
@@ -128,7 +128,7 @@ export default {
       });
 
       api.modifyClass("model:bookmark", {
-        pluginId: "discourse-encrypt",
+        pluginId: "fetch-encrypt-keys",
 
         loadItems(params) {
           return this._super(...arguments).then((response) => {
diff --git a/assets/javascripts/discourse/initializers/invite-to-encrypted-topic.js b/assets/javascripts/discourse/initializers/invite-to-encrypted-topic.js
index 505ad2dc..b6b7cd93 100644
--- a/assets/javascripts/discourse/initializers/invite-to-encrypted-topic.js
+++ b/assets/javascripts/discourse/initializers/invite-to-encrypted-topic.js
@@ -22,9 +22,9 @@ export default {
 
     withPluginApi("0.11.3", (api) => {
       api.modifyClass("model:topic", {
-        pluginId: "discourse-encrypt",
+        pluginId: "invite-to-encrypted-topic",
 
-        createInvite(user, group_names, custom_message) {
+        createInvite(user, group_ids, custom_message) {
           // TODO: https://github.com/emberjs/ember.js/issues/15291
           let { _super } = this;
           if (!hasTopicKey(this.id)) {
@@ -36,9 +36,9 @@ export default {
               exportKey(key, identities[user].encryptPublic)
             )
             .then((key) => {
-              ajax(`/t/${this.get("id")}/invite`, {
+              ajax(`/t/${this.id}/invite`, {
                 type: "POST",
-                data: { user, key, group_names, custom_message },
+                data: { user, key, group_ids, custom_message },
               });
             })
             .catch((username) => {