diff --git a/app/assets/javascripts/admin/addon/mixins/setting-object.js b/app/assets/javascripts/admin/addon/mixins/setting-object.js
index ce1952013dc..63567ebde67 100644
--- a/app/assets/javascripts/admin/addon/mixins/setting-object.js
+++ b/app/assets/javascripts/admin/addon/mixins/setting-object.js
@@ -48,17 +48,17 @@ export default Mixin.create({
 
   @discourseComputed("valid_values")
   validValues(validValues) {
-    const vals = [],
-      translateNames = this.translate_names;
+    const values = [];
+    const translateNames = this.translate_names;
 
     (validValues || []).forEach((v) => {
       if (v.name && v.name.length > 0 && translateNames) {
-        vals.addObject({ name: I18n.t(v.name), value: v.value });
+        values.addObject({ name: I18n.t(v.name), value: v.value });
       } else {
-        vals.addObject(v);
+        values.addObject(v);
       }
     });
-    return vals;
+    return values;
   },
 
   @discourseComputed("valid_values")
diff --git a/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js b/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
index 698324b9aba..370b4dc379a 100644
--- a/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
+++ b/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
@@ -6,7 +6,7 @@ import { setting } from "discourse/lib/computed";
 export default DropdownSelectBoxComponent.extend({
   pluginApiIdentifiers: ["categories-admin-dropdown"],
   classNames: ["categories-admin-dropdown"],
-  fixedCateoryPositions: setting("fixed_category_positions"),
+  fixedCategoryPositions: setting("fixed_category_positions"),
 
   selectKitOptions: {
     icons: ["wrench", "caret-down"],
@@ -26,7 +26,7 @@ export default DropdownSelectBoxComponent.extend({
       },
     ];
 
-    if (this.fixedCateoryPositions) {
+    if (this.fixedCategoryPositions) {
       items.push({
         id: "reorder",
         name: I18n.t("categories.reorder.title"),
diff --git a/app/assets/javascripts/select-kit/addon/components/category-row.js b/app/assets/javascripts/select-kit/addon/components/category-row.js
index 57e2f4c9bb9..2368843c53b 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/category-row.js
@@ -40,9 +40,9 @@ export default SelectKitRowComponent.extend({
 
   category: computed("rowValue", "rowName", function () {
     if (isEmpty(this.rowValue)) {
-      const uncat = Category.findUncategorized();
-      if (uncat && uncat.name === this.rowName) {
-        return uncat;
+      const uncategorized = Category.findUncategorized();
+      if (uncategorized && uncategorized.name === this.rowName) {
+        return uncategorized;
       }
     } else {
       return Category.findById(parseInt(this.rowValue, 10));
diff --git a/app/assets/javascripts/select-kit/addon/components/category-selector.js b/app/assets/javascripts/select-kit/addon/components/category-selector.js
index 09210dc06d7..dd48d3d16d6 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-selector.js
+++ b/app/assets/javascripts/select-kit/addon/components/category-selector.js
@@ -73,7 +73,7 @@ export default MultiSelectComponent.extend({
       if (subcategoryIds.size > 1) {
         result.push(
           EmberObject.create({
-            multicategory: [...subcategoryIds],
+            multiCategory: [...subcategoryIds],
             category: result[0],
             title: I18n.t("category_row.plus_subcategories_title", {
               name: result[0].name,
@@ -95,8 +95,8 @@ export default MultiSelectComponent.extend({
   },
 
   select(value, item) {
-    if (item.multicategory) {
-      const items = item.multicategory.map((id) =>
+    if (item.multiCategory) {
+      const items = item.multiCategory.map((id) =>
         Category.findById(parseInt(id, 10))
       );
 
diff --git a/app/assets/javascripts/select-kit/addon/components/user-notifications-dropdown.js b/app/assets/javascripts/select-kit/addon/components/user-notifications-dropdown.js
index 888b8a72098..e249f49f6fa 100644
--- a/app/assets/javascripts/select-kit/addon/components/user-notifications-dropdown.js
+++ b/app/assets/javascripts/select-kit/addon/components/user-notifications-dropdown.js
@@ -8,11 +8,11 @@ export default DropdownSelectBox.extend({
   classNames: ["user-notifications", "user-notifications-dropdown"],
 
   selectKitOptions: {
-    headerIcon: "userNotificationicon",
+    headerIcon: "userNotificationIcon",
     showCaret: true,
   },
 
-  userNotificationicon: computed("mainCollection.[]", "value", function () {
+  userNotificationIcon: computed("mainCollection.[]", "value", function () {
     return (
       this.mainCollection &&
       this.mainCollection.find((row) => row.id === this.value).icon