diff --git a/app/assets/javascripts/discourse/app/adapters/email-template.js b/app/assets/javascripts/discourse/app/adapters/email-template.js
index 272103ee8a8..dba32c64737 100644
--- a/app/assets/javascripts/discourse/app/adapters/email-template.js
+++ b/app/assets/javascripts/discourse/app/adapters/email-template.js
@@ -1,7 +1,7 @@
 import RestAdapter from "discourse/adapters/rest";
 
-export default RestAdapter.extend({
+export default class EmailTemplateAdapter extends RestAdapter {
   basePath() {
     return "/admin/customize/";
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/adapters/group.js b/app/assets/javascripts/discourse/app/adapters/group.js
index 5e5b6df18f4..2d77ec28014 100644
--- a/app/assets/javascripts/discourse/app/adapters/group.js
+++ b/app/assets/javascripts/discourse/app/adapters/group.js
@@ -1,7 +1,7 @@
 import RestAdapter from "discourse/adapters/rest";
 
-export default RestAdapter.extend({
+export default class GroupAdapter extends RestAdapter {
   appendQueryParams(path, findArgs) {
-    return this._super(path, findArgs, ".json");
-  },
-});
+    return super.appendQueryParams(path, findArgs, ".json");
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/adapters/list-tag.js b/app/assets/javascripts/discourse/app/adapters/list-tag.js
index 7f89508e908..e289285696c 100644
--- a/app/assets/javascripts/discourse/app/adapters/list-tag.js
+++ b/app/assets/javascripts/discourse/app/adapters/list-tag.js
@@ -1,6 +1,6 @@
 import RESTAdapter from "discourse/adapters/rest";
 
-export default class extends RESTAdapter {
+export default class ListTagAdapter extends RESTAdapter {
   pathFor(_store, _type, findArgs) {
     return this.appendQueryParams("/tags/list", findArgs);
   }
diff --git a/app/assets/javascripts/discourse/app/adapters/notification.js b/app/assets/javascripts/discourse/app/adapters/notification.js
index dc82965cf41..eb7b3e285ef 100644
--- a/app/assets/javascripts/discourse/app/adapters/notification.js
+++ b/app/assets/javascripts/discourse/app/adapters/notification.js
@@ -1,3 +1,5 @@
 import RestAdapter from "discourse/adapters/rest";
 
-export default RestAdapter.extend({ cache: true });
+export default class NotificationAdapter extends RestAdapter {
+  cache = true;
+}
diff --git a/app/assets/javascripts/discourse/app/adapters/post-reply-history.js b/app/assets/javascripts/discourse/app/adapters/post-reply-history.js
index e8d58d969a5..afe4bcffc86 100644
--- a/app/assets/javascripts/discourse/app/adapters/post-reply-history.js
+++ b/app/assets/javascripts/discourse/app/adapters/post-reply-history.js
@@ -1,7 +1,7 @@
 import RestAdapter from "discourse/adapters/rest";
 import { ajax } from "discourse/lib/ajax";
 
-export default RestAdapter.extend({
+export default class PostReplyHistoryAdapter extends RestAdapter {
   find(store, type, findArgs) {
     const maxReplies = this.siteSettings.max_reply_history;
     return ajax(
@@ -9,5 +9,5 @@ export default RestAdapter.extend({
     ).then((replies) => {
       return { post_reply_histories: replies };
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/adapters/post-reply.js b/app/assets/javascripts/discourse/app/adapters/post-reply.js
index 4d6871e2dec..72096414e5e 100644
--- a/app/assets/javascripts/discourse/app/adapters/post-reply.js
+++ b/app/assets/javascripts/discourse/app/adapters/post-reply.js
@@ -1,10 +1,10 @@
 import RestAdapter from "discourse/adapters/rest";
 import { ajax } from "discourse/lib/ajax";
 
-export default RestAdapter.extend({
+export default class PostReplyAdapter extends RestAdapter {
   find(store, type, findArgs) {
     return ajax(`/posts/${findArgs.postId}/replies`).then((replies) => {
       return { post_replies: replies };
     });
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/adapters/post.js b/app/assets/javascripts/discourse/app/adapters/post.js
index 58a7ce4094e..64fe85565dc 100644
--- a/app/assets/javascripts/discourse/app/adapters/post.js
+++ b/app/assets/javascripts/discourse/app/adapters/post.js
@@ -2,12 +2,12 @@ import { underscore } from "@ember/string";
 import RestAdapter, { Result } from "discourse/adapters/rest";
 import { ajax } from "discourse/lib/ajax";
 
-export default RestAdapter.extend({
+export default class PostAdapter extends RestAdapter {
   find(store, type, findArgs) {
-    return this._super(store, type, findArgs).then(function (result) {
+    return super.find(store, type, findArgs).then(function (result) {
       return { post: result };
     });
-  },
+  }
 
   createRecord(store, type, args) {
     const typeField = underscore(type);
@@ -17,5 +17,5 @@ export default RestAdapter.extend({
         return new Result(json[typeField], json);
       }
     );
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/adapters/reviewable-settings.js b/app/assets/javascripts/discourse/app/adapters/reviewable-settings.js
index 78e7176acac..cf9ff5269c6 100644
--- a/app/assets/javascripts/discourse/app/adapters/reviewable-settings.js
+++ b/app/assets/javascripts/discourse/app/adapters/reviewable-settings.js
@@ -1,7 +1,7 @@
 import RestAdapter from "discourse/adapters/rest";
 
-export default RestAdapter.extend({
+export default class ReviewableSettingsAdapter extends RestAdapter {
   pathFor() {
     return "/review/settings";
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/adapters/reviewable-topic.js b/app/assets/javascripts/discourse/app/adapters/reviewable-topic.js
index 512db804d5e..6be9b712e46 100644
--- a/app/assets/javascripts/discourse/app/adapters/reviewable-topic.js
+++ b/app/assets/javascripts/discourse/app/adapters/reviewable-topic.js
@@ -1,7 +1,7 @@
 import RestAdapter from "discourse/adapters/rest";
 
-export default RestAdapter.extend({
+export default class ReviewableTopicAdapter extends RestAdapter {
   pathFor() {
     return "/review/topics";
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/adapters/tag-info.js b/app/assets/javascripts/discourse/app/adapters/tag-info.js
index 80d4e288950..545f3ca1d1a 100644
--- a/app/assets/javascripts/discourse/app/adapters/tag-info.js
+++ b/app/assets/javascripts/discourse/app/adapters/tag-info.js
@@ -1,7 +1,7 @@
 import RESTAdapter from "discourse/adapters/rest";
 
-export default RESTAdapter.extend({
+export default class TagInfoAdapter extends RESTAdapter {
   pathFor(store, type, id) {
     return "/tag/" + id + "/info";
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/adapters/tag-notification.js b/app/assets/javascripts/discourse/app/adapters/tag-notification.js
index 3f9c62ff413..9b5e986ff5d 100644
--- a/app/assets/javascripts/discourse/app/adapters/tag-notification.js
+++ b/app/assets/javascripts/discourse/app/adapters/tag-notification.js
@@ -1,7 +1,7 @@
 import RESTAdapter from "discourse/adapters/rest";
 
-export default RESTAdapter.extend({
+export default class TagNotificationAdapter extends RESTAdapter {
   pathFor(store, type, id) {
     return "/tag/" + id + "/notifications";
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/adapters/tag.js b/app/assets/javascripts/discourse/app/adapters/tag.js
index aff21d705e6..05aef820dc2 100644
--- a/app/assets/javascripts/discourse/app/adapters/tag.js
+++ b/app/assets/javascripts/discourse/app/adapters/tag.js
@@ -1,7 +1,7 @@
 import RESTAdapter from "discourse/adapters/rest";
 
-export default RESTAdapter.extend({
+export default class TagAdapter extends RESTAdapter {
   pathFor(store, type, id) {
     return id ? `/tag/${id}` : `/tags`;
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/adapters/topic-list.js b/app/assets/javascripts/discourse/app/adapters/topic-list.js
index 3ba5e116cf8..e0f47abbcee 100644
--- a/app/assets/javascripts/discourse/app/adapters/topic-list.js
+++ b/app/assets/javascripts/discourse/app/adapters/topic-list.js
@@ -3,7 +3,7 @@ import { ajax } from "discourse/lib/ajax";
 import PreloadStore from "discourse/lib/preload-store";
 import Topic from "discourse/models/topic";
 
-export default RestAdapter.extend({
+export default class TopicListAdapter extends RestAdapter {
   find(store, type, { filter, params }) {
     return PreloadStore.getAndRemove("topic_list", () => {
       let url = `/${filter}.json`;
@@ -38,11 +38,11 @@ export default RestAdapter.extend({
       result.params = params;
       return result;
     });
-  },
+  }
 
   async applyTransformations(results) {
     for (const topicList of results) {
       await Topic.applyTransformations(topicList.topics);
     }
-  },
-});
+  }
+}
diff --git a/app/assets/javascripts/discourse/app/adapters/topic.js b/app/assets/javascripts/discourse/app/adapters/topic.js
index ee68791717c..78cb4c0dbb9 100644
--- a/app/assets/javascripts/discourse/app/adapters/topic.js
+++ b/app/assets/javascripts/discourse/app/adapters/topic.js
@@ -1,12 +1,12 @@
 import RestAdapter from "discourse/adapters/rest";
 import { ajax } from "discourse/lib/ajax";
 
-export default RestAdapter.extend({
+export default class TopicAdapter extends RestAdapter {
   find(store, type, findArgs) {
     if (findArgs.similar) {
       return ajax("/topics/similar_to", { data: findArgs.similar });
     } else {
-      return this._super(store, type, findArgs);
+      return super.find(store, type, findArgs);
     }
-  },
-});
+  }
+}