diff --git a/app/assets/javascripts/discourse/app/instance-initializers/admin-sidebar.js b/app/assets/javascripts/discourse/app/instance-initializers/admin-sidebar.js
index 97a0b99a849..8ed92805678 100644
--- a/app/assets/javascripts/discourse/app/instance-initializers/admin-sidebar.js
+++ b/app/assets/javascripts/discourse/app/instance-initializers/admin-sidebar.js
@@ -150,7 +150,7 @@ export function buildAdminSidebar(navConfig) {
 
 export default {
   initialize(owner) {
-    this.currentUser = owner.lookup("service:currentUser");
+    this.currentUser = owner.lookup("service:current-user");
     this.siteSettings = owner.lookup("service:site-settings");
 
     if (!this.currentUser?.staff) {
diff --git a/plugins/chat/test/javascripts/components/chat-channel-test.js b/plugins/chat/test/javascripts/components/chat-channel-test.js
index 7e419df40df..66dea083deb 100644
--- a/plugins/chat/test/javascripts/components/chat-channel-test.js
+++ b/plugins/chat/test/javascripts/components/chat-channel-test.js
@@ -57,7 +57,7 @@ module(
         currentUserMembership: { following: true },
         meta: { can_join_chat_channel: false },
       });
-      this.appEvents = this.container.lookup("service:appEvents");
+      this.appEvents = this.container.lookup("service:app-events");
     });
 
     test("it shows status on mentions", async function (assert) {
diff --git a/plugins/chat/test/javascripts/components/chat-notices-test.js b/plugins/chat/test/javascripts/components/chat-notices-test.js
index 12fdd84127a..0a6782029e2 100644
--- a/plugins/chat/test/javascripts/components/chat-notices-test.js
+++ b/plugins/chat/test/javascripts/components/chat-notices-test.js
@@ -12,7 +12,9 @@ module("Discourse Chat | Component | chat-notice", function (hooks) {
 
   test("displays all notices for a channel", async function (assert) {
     this.channel = fabricators.channel();
-    this.manager = this.container.lookup("service:chatChannelNoticesManager");
+    this.manager = this.container.lookup(
+      "service:chat-channel-notices-manager"
+    );
     this.manager.handleNotice({
       channel_id: this.channel.id,
       text_content: "hello",
@@ -38,7 +40,9 @@ module("Discourse Chat | Component | chat-notice", function (hooks) {
 
   test("Notices can be cleared", async function (assert) {
     this.channel = fabricators.channel();
-    this.manager = this.container.lookup("service:chatChannelNoticesManager");
+    this.manager = this.container.lookup(
+      "service:chat-channel-notices-manager"
+    );
     this.manager.handleNotice({
       channel_id: this.channel.id,
       text_content: "hello",
@@ -62,7 +66,9 @@ module("Discourse Chat | Component | chat-notice", function (hooks) {
   });
   test("MentionWithoutMembership notice renders", async function (assert) {
     this.channel = fabricators.channel();
-    this.manager = this.container.lookup("service:chatChannelNoticesManager");
+    this.manager = this.container.lookup(
+      "service:chat-channel-notices-manager"
+    );
     const text = "Joffrey can't chat, hermano";
     this.manager.handleNotice({
       channel_id: this.channel.id,