diff --git a/app/assets/javascripts/admin/templates/user_badges.hbs b/app/assets/javascripts/admin/templates/user_badges.hbs
index 90e208925db..393695e8422 100644
--- a/app/assets/javascripts/admin/templates/user_badges.hbs
+++ b/app/assets/javascripts/admin/templates/user_badges.hbs
@@ -35,7 +35,7 @@
         <th></th>
       </tr>
 
-      {{#each userBadge in groupedBadges}}
+      {{#each groupedBadges as |userBadge|}}
         <tr>
           <td>{{user-badge badge=userBadge.badge count=userBadge.count}}</td>
           <td>
diff --git a/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs b/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs
index 078b8b9315a..e24d25bfb2d 100644
--- a/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs
@@ -1,4 +1,4 @@
-{{#each navItem in navItems}}
+{{#each navItems as |navItem|}}
   {{navigation-item content=navItem filterMode=filterMode}}
 {{/each}}
 {{custom-html "extraNavItem"}}
diff --git a/app/assets/javascripts/discourse/templates/exception.hbs b/app/assets/javascripts/discourse/templates/exception.hbs
index 34f2234dc5a..69537d6d70a 100644
--- a/app/assets/javascripts/discourse/templates/exception.hbs
+++ b/app/assets/javascripts/discourse/templates/exception.hbs
@@ -13,7 +13,7 @@
       {{desc}}
     </div>
     <div class="buttons">
-      {{#each buttonData in enabledButtons}}
+      {{#each enabledButtons as |buttonData|}}
         {{d-button icon=buttonData.icon action=buttonData.action label=buttonData.key class=buttonData.classes}}
       {{/each}}
       {{conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/discourse/templates/list/action-list.raw.hbs b/app/assets/javascripts/discourse/templates/list/action-list.raw.hbs
index a859ec7e397..428a5c53a72 100644
--- a/app/assets/javascripts/discourse/templates/list/action-list.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/action-list.raw.hbs
@@ -1,8 +1,8 @@
 {{#if postNumbers}}
 <div class='post-actions {{className}}'>
   <i class='fa fa-{{icon}}'></i>
-  {{#each postNumber in postNumbers}}
-  <a href='{{topic.url}}/{{postNumber}}'>#{{postNumber}}</a>
+  {{#each postNumbers as |postNumber|}}
+    <a href='{{topic.url}}/{{postNumber}}'>#{{postNumber}}</a>
   {{/each}}
 </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs b/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
index 8f366864e83..456db2abce7 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
@@ -6,7 +6,7 @@
 </li>
 {{#if expanded}}
 <ul class='drop'>
-  {{#each navItem in navItems}}
+  {{#each navItems as |navItem|}}
     {{navigation-item content=navItem filterMode=filterMode}}
   {{/each}}
 </ul>