diff --git a/app/components/assign-students.hbs b/app/components/assign-students.hbs
index 8d31504c62..971ebc20b2 100644
--- a/app/components/assign-students.hbs
+++ b/app/components/assign-students.hbs
@@ -78,10 +78,10 @@
       </thead>
       <tbody>
         {{#each this.filteredStudents as |user|}}
-          <tr class={{if (contains user.id this.selectedUserIds) "highlighted"}}>
+          <tr class={{if (includes user.id this.selectedUserIds) "highlighted"}}>
             <td class="text-left" colspan="1">
               <input type="checkbox"
-                checked={{if (contains user.id this.selectedUserIds) "checked"}}
+                checked={{if (includes user.id this.selectedUserIds) "checked"}}
                 {{on "click" (action "toggleUserSelection" user.id)}}
               >
             </td>
diff --git a/app/components/bulk-new-users.hbs b/app/components/bulk-new-users.hbs
index b4dd5a3e34..d2631cc6f8 100644
--- a/app/components/bulk-new-users.hbs
+++ b/app/components/bulk-new-users.hbs
@@ -118,7 +118,7 @@
                     type="checkbox"
                     checked={{and
                       (v-get obj "isValid")
-                      (contains obj selectedUsers)
+                      (includes obj selectedUsers)
                     }}
                     onclick={{action "toggleUserSelection" obj}}
                     disabled={{v-get obj "isInvalid"}}
diff --git a/app/components/curriculum-inventory-report-header.hbs b/app/components/curriculum-inventory-report-header.hbs
index 2afe176e75..c1c7b719c9 100644
--- a/app/components/curriculum-inventory-report-header.hbs
+++ b/app/components/curriculum-inventory-report-header.hbs
@@ -19,7 +19,7 @@
         {{#if
           (and
             (v-get this "reportName" "isInvalid")
-            (contains "reportName" showErrorsFor)
+            (includes "reportName" showErrorsFor)
           )
         }}
           <span class="validation-error-message">
diff --git a/app/components/curriculum-inventory-report-overview.hbs b/app/components/curriculum-inventory-report-overview.hbs
index cd2aa35820..fec3dedff3 100644
--- a/app/components/curriculum-inventory-report-overview.hbs
+++ b/app/components/curriculum-inventory-report-overview.hbs
@@ -51,7 +51,7 @@
               {{#if
                 (and
                   (v-get this "startDate" "isInvalid")
-                  (contains "startDate" showErrorsFor)
+                  (includes "startDate" showErrorsFor)
                 )
               }}
                 <span class="validation-error-message">
@@ -83,7 +83,7 @@
               {{#if
                 (and
                   (v-get this "endDate" "isInvalid")
-                  (contains "endDate" showErrorsFor)
+                  (includes "endDate" showErrorsFor)
                 )
               }}
                 <span class="validation-error-message">
@@ -152,7 +152,7 @@
               {{#if
                 (and
                   (v-get this "description" "isInvalid")
-                  (contains "description" showErrorsFor)
+                  (includes "description" showErrorsFor)
                 )
               }}
                 <span class="validation-error-message">
diff --git a/app/components/curriculum-inventory-report-rollover.hbs b/app/components/curriculum-inventory-report-rollover.hbs
index 9dfc9710ad..5e7f7e8a34 100644
--- a/app/components/curriculum-inventory-report-rollover.hbs
+++ b/app/components/curriculum-inventory-report-rollover.hbs
@@ -20,7 +20,7 @@
       onkeyup={{action "addErrorDisplayFor" "name"}}
       placeholder={{t "general.reportNamePlaceholder"}}
     >
-    {{#if (and (v-get this "name" "isInvalid") (contains "name" showErrorsFor))}}
+    {{#if (and (v-get this "name" "isInvalid") (includes "name" showErrorsFor))}}
       <span class="validation-error-message">
         {{v-get this "name" "message"}}
       </span>
diff --git a/app/components/curriculum-inventory-sequence-block-min-max-editor.hbs b/app/components/curriculum-inventory-sequence-block-min-max-editor.hbs
index b5f20a8c9d..2db43f7297 100644
--- a/app/components/curriculum-inventory-sequence-block-min-max-editor.hbs
+++ b/app/components/curriculum-inventory-sequence-block-min-max-editor.hbs
@@ -9,7 +9,7 @@
     disabled={{or isSaving isElective}}
     onkeyup={{action "addErrorDisplayFor" "minimum"}}
   >
-  {{#if (and (v-get this "minimum" "isInvalid") (contains "minimum" showErrorsFor))
+  {{#if (and (v-get this "minimum" "isInvalid") (includes "minimum" showErrorsFor))
   }}
     <span class="validation-error-message">
       {{v-get this "minimum" "message"}}
@@ -27,7 +27,7 @@
     disabled={{isSaving}}
     onkeyup={{action "addErrorDisplayFor" "maximum"}}
   >
-  {{#if (and (v-get this "maximum" "isInvalid") (contains "maximum" showErrorsFor))
+  {{#if (and (v-get this "maximum" "isInvalid") (includes "maximum" showErrorsFor))
   }}
     <span class="validation-error-message">
       {{v-get this "maximum" "message"}}
diff --git a/app/components/curriculum-inventory-sequence-block-session-list.hbs b/app/components/curriculum-inventory-sequence-block-session-list.hbs
index e33677eaf3..1cbb7a7762 100644
--- a/app/components/curriculum-inventory-sequence-block-session-list.hbs
+++ b/app/components/curriculum-inventory-sequence-block-session-list.hbs
@@ -51,14 +51,14 @@
             <tr>
               <td class="text-center" colspan="2">
                 {{if
-                  (contains session linkedSessions)
+                  (includes session linkedSessions)
                   (t "general.yes")
                   (t "general.no")
                 }}
               </td>
               <td class="text-center" colspan="2">
                 {{if
-                  (contains session excludedSessions)
+                  (includes session excludedSessions)
                   (t "general.yes")
                   (t "general.no")
                 }}
@@ -75,7 +75,7 @@
                 {{get (await session.sessionType) "title"}}
               </td>
               <td class="text-center" colspan="1">
-                {{#if (contains session linkedSessions)}}
+                {{#if (includes session linkedSessions)}}
                   {{#if (is-pending session.maxDuration)}}
                     <LoadingSpinner />
                   {{else}}
diff --git a/app/components/curriculum-inventory-sequence-block-session-manager.hbs b/app/components/curriculum-inventory-sequence-block-session-manager.hbs
index 1936832517..e190cc47f3 100644
--- a/app/components/curriculum-inventory-sequence-block-session-manager.hbs
+++ b/app/components/curriculum-inventory-sequence-block-session-manager.hbs
@@ -75,14 +75,14 @@
               <td class="text-center" colspan="2">
                 <Input
                   @type="checkbox"
-                  @checked={{contains session linkedSessionsBuffer}}
+                  @checked={{includes session linkedSessionsBuffer}}
                   @change={{action "changeSession" session}}
                 />
               </td>
               <td class="text-center" colspan="2">
                 <Input
                   @type="checkbox"
-                  @checked={{contains session excludedSessionsBuffer}}
+                  @checked={{includes session excludedSessionsBuffer}}
                   @change={{action "excludeSession" session}}
                 />
               </td>
@@ -98,7 +98,7 @@
                 {{get (await session.sessionType) "title"}}
               </td>
               <td class="text-center" colspan="1">
-                {{#if (contains session linkedSessionsBuffer)}}
+                {{#if (includes session linkedSessionsBuffer)}}
                   {{#if (is-pending session.maxDuration)}}
                     <LoadingSpinner />
                   {{else}}
diff --git a/app/components/global-search.hbs b/app/components/global-search.hbs
index e36802d9b4..a7e570ee20 100644
--- a/app/components/global-search.hbs
+++ b/app/components/global-search.hbs
@@ -55,7 +55,7 @@
                   type="checkbox"
                   checked={{or
                     (eq obj.results 0)
-                    (not (contains obj.id ignoredSchoolIds))
+                    (not (includes obj.id ignoredSchoolIds))
                   }}
                   onclick={{action "toggleSchoolSelection" obj.id}}
                   disabled={{eq obj.results 0}}
diff --git a/app/components/ilios-course-list.hbs b/app/components/ilios-course-list.hbs
index 803ce9d563..6bb24754a7 100644
--- a/app/components/ilios-course-list.hbs
+++ b/app/components/ilios-course-list.hbs
@@ -62,7 +62,7 @@
     <tbody data-test-courses>
       {{#each (sort-by (if this.sortingByStatus (fn this.sortCoursesByStatus) @sortBy) @courses) as |course|}}
         <tr
-          class={{if (contains course.id this.coursesForRemovalConfirmation) "confirm-removal"}}
+          class={{if (includes course.id this.coursesForRemovalConfirmation) "confirm-removal"}}
           data-test-active-row
         >
           <td class="text-left" colspan="3">
@@ -89,7 +89,7 @@
             {{moment-format course.endDate "L"}}
           </td>
           <td class="text-left" colspan="3">
-            {{#if (contains course.id this.savingCourseIds)}}
+            {{#if (includes course.id this.savingCourseIds)}}
               <LoadingSpinner />
             {{else}}
               <PublicationStatus @item={{course}} @showText={{true}} @showIcon={{false}} />
@@ -122,7 +122,7 @@
             {{/if}}
           </td>
         </tr>
-        {{#if (contains course.id this.coursesForRemovalConfirmation)}}
+        {{#if (includes course.id this.coursesForRemovalConfirmation)}}
           <tr class="confirm-removal">
             <td colspan="15">
               <div class="confirm-message">
diff --git a/app/components/instructorgroup-header.hbs b/app/components/instructorgroup-header.hbs
index b2f16ac2a2..f026e77001 100644
--- a/app/components/instructorgroup-header.hbs
+++ b/app/components/instructorgroup-header.hbs
@@ -21,7 +21,7 @@
           disabled={{isSaving}}
           onkeyup={{action "addErrorDisplayFor" "title"}}
         >
-        {{#if (and (v-get this "title" "isInvalid") (contains "title" showErrorsFor))
+        {{#if (and (v-get this "title" "isInvalid") (includes "title" showErrorsFor))
         }}
           <span class="validation-error-message">
             {{v-get this "title" "message"}}
diff --git a/app/components/learnergroup-cohort-user-manager.hbs b/app/components/learnergroup-cohort-user-manager.hbs
index 1b2e3246c0..ee85e4607c 100644
--- a/app/components/learnergroup-cohort-user-manager.hbs
+++ b/app/components/learnergroup-cohort-user-manager.hbs
@@ -54,7 +54,7 @@
                   {{#if @canUpdate}}
                     <input
                       type="checkbox"
-                      checked={{contains user selectedUsers}}
+                      checked={{includes user selectedUsers}}
                       {{on "click" (fn this.toggleUserSelection user)}}
                     >
                   {{/if}}
@@ -78,7 +78,7 @@
               </td>
               <td class="text-left" colspan="1">
                 {{#if user.enabled}}
-                  {{#if (contains user this.usersBeingMoved)}}
+                  {{#if (includes user this.usersBeingMoved)}}
                     <LoadingSpinner />
                   {{else if (and @canUpdate (eq this.selectedUsers.length 0))}}
                     <FaIcon
diff --git a/app/components/learnergroup-header.hbs b/app/components/learnergroup-header.hbs
index 7d3f42704a..6c4f8cc0db 100644
--- a/app/components/learnergroup-header.hbs
+++ b/app/components/learnergroup-header.hbs
@@ -18,7 +18,7 @@
               onkeyup={{action "addErrorDisplayFor" "title"}}
             >
             {{#if
-              (and (v-get this "title" "isInvalid") (contains "title" showErrorsFor))
+              (and (v-get this "title" "isInvalid") (includes "title" showErrorsFor))
             }}
               <span class="validation-error-message">
                 {{v-get this "title" "message"}}
diff --git a/app/components/learnergroup-list.hbs b/app/components/learnergroup-list.hbs
index 2f13a83d2e..85df1816d9 100644
--- a/app/components/learnergroup-list.hbs
+++ b/app/components/learnergroup-list.hbs
@@ -38,7 +38,7 @@
       {{#each (sort-by this.sortBy @learnerGroups) as |learnerGroup|}}
         <tr
           class={{if
-            (contains learnerGroup.id (map-by "id" this.toRemove))
+            (includes learnerGroup.id (map-by "id" this.toRemove))
             "confirm-removal"
           }}
           data-test-active-row
@@ -68,7 +68,7 @@
                   data-test-remove
                   {{on "click" (perform this.confirmRemove learnerGroup)}}
                 >
-                  {{#if (contains learnerGroup this.preparingToRemove)}}
+                  {{#if (includes learnerGroup this.preparingToRemove)}}
                     <FaIcon @icon="spinner" @spin={{true}} />
                   {{else}}
                     <FaIcon @icon="trash" class="enabled" />
@@ -93,7 +93,7 @@
             {{/if}}
           </td>
         </tr>
-        {{#if (contains learnerGroup.id (map-by "id" this.toRemove))}}
+        {{#if (includes learnerGroup.id (map-by "id" this.toRemove))}}
           {{#let (find-by "id" learnerGroup.id this.toRemove) as |removableGroup|}}
             <tr class="confirm-removal" data-test-confirm-removal>
               <td colspan={{if (media "isLaptopAndUp") "5" "3"}}>
@@ -143,7 +143,7 @@
             </tr>
           {{/let}}
         {{/if}}
-        {{#if (contains learnerGroup this.toCopy)}}
+        {{#if (includes learnerGroup this.toCopy)}}
           <tr class="confirm-copy" data-test-confirm-copy>
             <td colspan={{if (media "isLaptopAndUp") "6" "3"}}>
               <div class="confirm-buttons">
diff --git a/app/components/learnergroup-summary.hbs b/app/components/learnergroup-summary.hbs
index 79ab3f076b..a367bfccda 100644
--- a/app/components/learnergroup-summary.hbs
+++ b/app/components/learnergroup-summary.hbs
@@ -28,7 +28,7 @@
             {{#if
               (and
                 (v-get this "location" "isInvalid")
-                (contains "location" showErrorsFor)
+                (includes "location" showErrorsFor)
               )
             }}
               <span class="validation-error-message">
diff --git a/app/components/learnergroup-user-manager.hbs b/app/components/learnergroup-user-manager.hbs
index 58cf13c832..8aacdafd61 100644
--- a/app/components/learnergroup-user-manager.hbs
+++ b/app/components/learnergroup-user-manager.hbs
@@ -75,7 +75,7 @@
                     {{#if @isEditing}}
                       <input
                         type="checkbox"
-                        checked={{contains user.content this.selectedUsers}}
+                        checked={{includes user.content this.selectedUsers}}
                         onclick={{fn this.toggleUserSelection user.content}}
                       >
                     {{/if}}
@@ -108,7 +108,7 @@
                     </LinkTo>
                   </td>
                   <td>
-                    {{#if (contains user.content this.usersBeingMoved)}}
+                    {{#if (includes user.content this.usersBeingMoved)}}
                       <LoadingSpinner />
                     {{else if user.enabled}}
                       {{#if (eq this.selectedUsers.length 0)}}
@@ -144,7 +144,7 @@
                       {{#if @isEditing}}
                         <input
                           type="checkbox"
-                          checked={{contains user.content this.selectedUsers}}
+                          checked={{includes user.content this.selectedUsers}}
                           {{on "click" (fn this.toggleUserSelection user.content)}}
                         >
                       {{/if}}
@@ -177,7 +177,7 @@
                       </LinkTo>
                     </td>
                     <td>
-                      {{#if (contains user.content this.usersBeingMoved)}}
+                      {{#if (includes user.content this.usersBeingMoved)}}
                         <LoadingSpinner />
                       {{else if user.enabled}}
                         {{#if (eq this.selectedUsers.length 0)}}
diff --git a/app/components/new-competency.hbs b/app/components/new-competency.hbs
index 514928cd69..114d0f9f08 100644
--- a/app/components/new-competency.hbs
+++ b/app/components/new-competency.hbs
@@ -12,7 +12,7 @@
     {{t "general.add"}}
   {{/if}}
 </button>
-{{#if (and (v-get this "title" "isInvalid") (contains "title" showErrorsFor))}}
+{{#if (and (v-get this "title" "isInvalid") (includes "title" showErrorsFor))}}
   <span class="validation-error-message">
     {{v-get this "title" "message"}}
   </span>
diff --git a/app/components/new-course.hbs b/app/components/new-course.hbs
index af19bfae74..2ef097739f 100644
--- a/app/components/new-course.hbs
+++ b/app/components/new-course.hbs
@@ -17,7 +17,7 @@
       onkeyup={{action "addErrorDisplayFor" "title"}}
     >
     {{#if
-      (and (v-get this "title" "isInvalid") (contains "title" this.showErrorsFor))
+      (and (v-get this "title" "isInvalid") (includes "title" this.showErrorsFor))
     }}
       <span class="validation-error-message">
         {{v-get this "title" "message"}}
diff --git a/app/components/new-curriculum-inventory-report.hbs b/app/components/new-curriculum-inventory-report.hbs
index a33866ac95..453c7e6b21 100644
--- a/app/components/new-curriculum-inventory-report.hbs
+++ b/app/components/new-curriculum-inventory-report.hbs
@@ -16,7 +16,7 @@
         onkeyup={{action "addErrorDisplayFor" "name"}}
         placeholder={{t "general.reportNamePlaceholder"}}
       >
-      {{#if (and (v-get this "name" "isInvalid") (contains "name" showErrorsFor))}}
+      {{#if (and (v-get this "name" "isInvalid") (includes "name" showErrorsFor))}}
         <span class="validation-error-message">
           {{v-get this "name" "message"}}
         </span>
diff --git a/app/components/new-curriculum-inventory-sequence-block.hbs b/app/components/new-curriculum-inventory-sequence-block.hbs
index 8667950461..3a6ce1c115 100644
--- a/app/components/new-curriculum-inventory-sequence-block.hbs
+++ b/app/components/new-curriculum-inventory-sequence-block.hbs
@@ -15,7 +15,7 @@
         onkeyup={{action "addErrorDisplayFor" "title"}}
         placeholder={{t "general.sequenceBlockTitlePlaceholder"}}
       >
-      {{#if (and (v-get this "title" "isInvalid") (contains "title" showErrorsFor))
+      {{#if (and (v-get this "title" "isInvalid") (includes "title" showErrorsFor))
       }}
         <span class="validation-error-message">
           {{v-get this "title" "message"}}
@@ -87,7 +87,7 @@
       />
       {{#if
         (and
-          (v-get this "startDate" "isInvalid") (contains "startDate" showErrorsFor)
+          (v-get this "startDate" "isInvalid") (includes "startDate" showErrorsFor)
         )
       }}
         <span class="validation-error-message">
@@ -105,7 +105,7 @@
         data-test-end-date-picker
       />
       {{#if
-        (and (v-get this "endDate" "isInvalid") (contains "endDate" showErrorsFor))
+        (and (v-get this "endDate" "isInvalid") (includes "endDate" showErrorsFor))
       }}
         <span class="validation-error-message">
           {{v-get this "endDate" "message"}}
@@ -125,7 +125,7 @@
       >
       {{#if
         (and
-          (v-get this "duration" "isInvalid") (contains "duration" showErrorsFor)
+          (v-get this "duration" "isInvalid") (includes "duration" showErrorsFor)
         )
       }}
         <span class="validation-error-message">
@@ -156,7 +156,7 @@
         onkeyup={{action "addErrorDisplayFor" "minimum"}}
       >
       {{#if
-        (and (v-get this "minimum" "isInvalid") (contains "minimum" showErrorsFor))
+        (and (v-get this "minimum" "isInvalid") (includes "minimum" showErrorsFor))
       }}
         <span class="validation-error-message">
           {{v-get this "minimum" "message"}}
@@ -175,7 +175,7 @@
         onkeyup={{action "addErrorDisplayFor" "maximum"}}
       >
       {{#if
-        (and (v-get this "maximum" "isInvalid") (contains "maximum" showErrorsFor))
+        (and (v-get this "maximum" "isInvalid") (includes "maximum" showErrorsFor))
       }}
         <span class="validation-error-message">
           {{v-get this "maximum" "message"}}
diff --git a/app/components/new-directory-user.hbs b/app/components/new-directory-user.hbs
index adaafe01f2..b8cb782cb5 100644
--- a/app/components/new-directory-user.hbs
+++ b/app/components/new-directory-user.hbs
@@ -68,7 +68,7 @@
         onkeyup={{action "addErrorDisplayFor" "otherId"}}
       >
       {{#if
-        (and (v-get this "otherId" "isInvalid") (contains "otherId" showErrorsFor))
+        (and (v-get this "otherId" "isInvalid") (includes "otherId" showErrorsFor))
       }}
         <span class="validation-error-message">
           {{v-get this "otherId" "message"}}
@@ -88,7 +88,7 @@
         >
         {{#if
           (and
-            (v-get this "username" "isInvalid") (contains "username" showErrorsFor)
+            (v-get this "username" "isInvalid") (includes "username" showErrorsFor)
           )
         }}
           <span class="validation-error-message">
@@ -114,7 +114,7 @@
         >
         {{#if
           (and
-            (v-get this "password" "isInvalid") (contains "password" showErrorsFor)
+            (v-get this "password" "isInvalid") (includes "password" showErrorsFor)
           )
         }}
           <span class="validation-error-message">
diff --git a/app/components/new-instructorgroup.hbs b/app/components/new-instructorgroup.hbs
index ea3ceecd4d..f961b1121c 100644
--- a/app/components/new-instructorgroup.hbs
+++ b/app/components/new-instructorgroup.hbs
@@ -15,7 +15,7 @@
       placeholder={{t "general.instructorGroupTitlePlaceholder"}}
       data-test-title
     >
-    {{#if (and (v-get this "title" "isInvalid") (contains "title" showErrorsFor))}}
+    {{#if (and (v-get this "title" "isInvalid") (includes "title" showErrorsFor))}}
       <span class="validation-error-message">
         {{v-get this "title" "message"}}
       </span>
diff --git a/app/components/new-learnergroup-multiple.hbs b/app/components/new-learnergroup-multiple.hbs
index adb693a8fa..a32261c751 100644
--- a/app/components/new-learnergroup-multiple.hbs
+++ b/app/components/new-learnergroup-multiple.hbs
@@ -19,7 +19,7 @@
     {{#if
       (and
         (v-get this "numSubGroups" "isInvalid")
-        (contains "numSubGroups" showErrorsFor)
+        (includes "numSubGroups" showErrorsFor)
       )
     }}
       <span class="validation-error-message">
diff --git a/app/components/new-learnergroup-single.hbs b/app/components/new-learnergroup-single.hbs
index 7856ddcf4a..69cd503f9e 100644
--- a/app/components/new-learnergroup-single.hbs
+++ b/app/components/new-learnergroup-single.hbs
@@ -11,7 +11,7 @@
     placeholder={{t "general.learnerGroupTitlePlaceholder"}}
     data-test-title
   >
-  {{#if (and (v-get this "title" "isInvalid") (contains "title" showErrorsFor))}}
+  {{#if (and (v-get this "title" "isInvalid") (includes "title" showErrorsFor))}}
     <span class="validation-error-message">
       {{v-get this "title" "message"}}
     </span>
diff --git a/app/components/new-myreport.hbs b/app/components/new-myreport.hbs
index f82d31006d..70da2484f3 100644
--- a/app/components/new-myreport.hbs
+++ b/app/components/new-myreport.hbs
@@ -14,7 +14,7 @@
       onkeyup={{action "addErrorDisplayFor" "title"}}
       data-test-report-title
     >
-    {{#if (and (v-get this "title" "isInvalid") (contains "title" showErrorsFor))}}
+    {{#if (and (v-get this "title" "isInvalid") (includes "title" showErrorsFor))}}
       <span class="validation-error-message">
         {{v-get this "title" "message"}}
       </span>
@@ -80,7 +80,7 @@
     </select>
   </p>
   {{#if this.currentPrepositionalObject}}
-    {{#if (contains this.currentPrepositionalObject (w "course session"))}}
+    {{#if (includes this.currentPrepositionalObject (w "course session"))}}
       <select
         data-test-report-year-filter
         onchange={{action "changeSelectedYear" value="target.value"}}
diff --git a/app/components/new-program.hbs b/app/components/new-program.hbs
index a57ef9a630..a6085170cd 100644
--- a/app/components/new-program.hbs
+++ b/app/components/new-program.hbs
@@ -14,7 +14,7 @@
       onkeyup={{action "addErrorDisplayFor" "title"}}
       placeholder={{t "general.programTitlePlaceholder"}}
     >
-    {{#if (and (v-get this "title" "isInvalid") (contains "title" showErrorsFor))}}
+    {{#if (and (v-get this "title" "isInvalid") (includes "title" showErrorsFor))}}
       <span class="validation-error-message">
         {{v-get this "title" "message"}}
       </span>
diff --git a/app/components/new-user.hbs b/app/components/new-user.hbs
index 878ceb47d8..681881e660 100644
--- a/app/components/new-user.hbs
+++ b/app/components/new-user.hbs
@@ -25,7 +25,7 @@
     >
     {{#if
       (and
-        (v-get this "firstName" "isInvalid") (contains "firstName" showErrorsFor)
+        (v-get this "firstName" "isInvalid") (includes "firstName" showErrorsFor)
       )
     }}
       <span class="message error">
@@ -45,7 +45,7 @@
     >
     {{#if
       (and
-        (v-get this "middleName" "isInvalid") (contains "middleName" showErrorsFor)
+        (v-get this "middleName" "isInvalid") (includes "middleName" showErrorsFor)
       )
     }}
       <span class="message error">
@@ -64,7 +64,7 @@
       onkeyup={{action "addErrorDisplayFor" "lastName"}}
     >
     {{#if
-      (and (v-get this "lastName" "isInvalid") (contains "lastName" showErrorsFor))
+      (and (v-get this "lastName" "isInvalid") (includes "lastName" showErrorsFor))
     }}
       <span class="message error">
         {{v-get this "lastName" "message"}}
@@ -82,7 +82,7 @@
       onkeyup={{action "addErrorDisplayFor" "campusId"}}
     >
     {{#if
-      (and (v-get this "campusId" "isInvalid") (contains "campusId" showErrorsFor))
+      (and (v-get this "campusId" "isInvalid") (includes "campusId" showErrorsFor))
     }}
       <span class="message error">
         {{v-get this "campusId" "message"}}
@@ -100,7 +100,7 @@
       onkeyup={{action "addErrorDisplayFor" "otherId"}}
     >
     {{#if
-      (and (v-get this "otherId" "isInvalid") (contains "otherId" showErrorsFor))
+      (and (v-get this "otherId" "isInvalid") (includes "otherId" showErrorsFor))
     }}
       <span class="message error">
         {{v-get this "otherId" "message"}}
@@ -117,7 +117,7 @@
       oninput={{action (mut email) value="target.value"}}
       onkeyup={{action "addErrorDisplayFor" "email"}}
     >
-    {{#if (and (v-get this "email" "isInvalid") (contains "email" showErrorsFor))}}
+    {{#if (and (v-get this "email" "isInvalid") (includes "email" showErrorsFor))}}
       <span class="message error">
         {{v-get this "email" "message"}}
       </span>
@@ -133,7 +133,7 @@
       oninput={{action (mut phone) value="target.value"}}
       onkeyup={{action "addErrorDisplayFor" "phone"}}
     >
-    {{#if (and (v-get this "phone" "isInvalid") (contains "phone" showErrorsFor))}}
+    {{#if (and (v-get this "phone" "isInvalid") (includes "phone" showErrorsFor))}}
       <span class="message error">
         {{v-get this "phone" "message"}}
       </span>
@@ -150,7 +150,7 @@
       onkeyup={{action "addErrorDisplayFor" "username"}}
     >
     {{#if
-      (and (v-get this "username" "isInvalid") (contains "username" showErrorsFor))
+      (and (v-get this "username" "isInvalid") (includes "username" showErrorsFor))
     }}
       <span class="message error">
         {{v-get this "username" "message"}}
@@ -168,7 +168,7 @@
       onkeyup={{action "addErrorDisplayFor" "password"}}
     >
     {{#if
-      (and (v-get this "password" "isInvalid") (contains "password" showErrorsFor))
+      (and (v-get this "password" "isInvalid") (includes "password" showErrorsFor))
     }}
       <span class="message error">
         {{v-get this "password" "message"}}
diff --git a/app/components/program-header.hbs b/app/components/program-header.hbs
index 31e6536fd4..5bbcb2c925 100644
--- a/app/components/program-header.hbs
+++ b/app/components/program-header.hbs
@@ -19,7 +19,7 @@
           {{#if
             (and
               (v-get this "programTitle" "isInvalid")
-              (contains "programTitle" showErrorsFor)
+              (includes "programTitle" showErrorsFor)
             )
           }}
             <span class="validation-error-message">
diff --git a/app/components/program-overview.hbs b/app/components/program-overview.hbs
index 9c5697b700..0a39b13e90 100644
--- a/app/components/program-overview.hbs
+++ b/app/components/program-overview.hbs
@@ -27,7 +27,7 @@
             {{#if
               (and
                 (v-get this "shortTitle" "isInvalid")
-                (contains "shortTitle" showErrorsFor)
+                (includes "shortTitle" showErrorsFor)
               )
             }}
               <span class="validation-error-message">
diff --git a/app/components/program-year/manage-objective-competency.hbs b/app/components/program-year/manage-objective-competency.hbs
index 1c89112b47..8f61482443 100644
--- a/app/components/program-year/manage-objective-competency.hbs
+++ b/app/components/program-year/manage-objective-competency.hbs
@@ -8,7 +8,7 @@
         <li class="domain {{if
               (or
                 (eq @selected.id domain.id)
-                (contains @selected.id (map-by "id" domain.competencies))
+                (includes @selected.id (map-by "id" domain.competencies))
               )
               "selected"
             }}"
diff --git a/app/components/programyear-competencies.hbs b/app/components/programyear-competencies.hbs
index 853057db3b..ac274a3f8e 100644
--- a/app/components/programyear-competencies.hbs
+++ b/app/components/programyear-competencies.hbs
@@ -49,7 +49,7 @@
           {{#each (sort-by "title" (await domains)) as |domain|}}
             <li>
               {{#if
-                (contains (get domain "id") (map-by "id" selectedCompetencies))
+                (includes (get domain "id") (map-by "id" selectedCompetencies))
               }}
                 <label class="clickable">
                   <input type="checkbox" checked="" {{on "click" (action "removeCompetencyFromBuffer" domain)}}>
@@ -59,7 +59,7 @@
                 <label class="clickable">
                   <input
                     type="checkbox"
-                    indeterminate={{contains
+                    indeterminate={{includes
                       domain
                       (await competenciesWithSelectedChildren)
                     }}
@@ -70,10 +70,10 @@
               {{/if}}
               <ul>
                 {{#each (sort-by "title" (await competencies)) as |competency|}}
-                  {{#if (contains competency (await domain.treeChildren))}}
+                  {{#if (includes competency (await domain.treeChildren))}}
                     <li>
                       {{#if
-                        (contains
+                        (includes
                           (get competency "id") (map-by "id" selectedCompetencies)
                         )
                       }}
@@ -105,8 +105,8 @@
           {{#each (sort-by "title" (await domains)) as |domain|}}
             {{#if
               (or
-                (contains domain.id (map-by "id" selectedCompetencies))
-                (contains domain (await competenciesWithSelectedChildren))
+                (includes domain.id (map-by "id" selectedCompetencies))
+                (includes domain (await competenciesWithSelectedChildren))
               )
             }}
               <li>
@@ -115,8 +115,8 @@
                   {{#each (sort-by "title" (await competencies)) as |competency|}}
                     {{#if
                       (and
-                        (contains competency (await domain.treeChildren))
-                        (contains
+                        (includes competency (await domain.treeChildren))
+                        (includes
                           competency.id (map-by "id" selectedCompetencies)
                         )
                       )
diff --git a/app/components/school-curriculum-inventory-institution-manager.hbs b/app/components/school-curriculum-inventory-institution-manager.hbs
index 12536f643b..dbb3c8cf14 100644
--- a/app/components/school-curriculum-inventory-institution-manager.hbs
+++ b/app/components/school-curriculum-inventory-institution-manager.hbs
@@ -35,7 +35,7 @@
           oninput={{action (mut this.name) value="target.value"}}
           onkeyup={{action "addErrorDisplayFor" "name"}}
         >
-        {{#if (and (v-get this "name" "isInvalid") (contains "name" showErrorsFor))}}
+        {{#if (and (v-get this "name" "isInvalid") (includes "name" showErrorsFor))}}
           <span class="validation-error-message">
             {{v-get this "name" "message"}}
           </span>
@@ -54,7 +54,7 @@
         >
         {{#if
           (and
-            (v-get this "aamcCode" "isInvalid") (contains "aamcCode" showErrorsFor)
+            (v-get this "aamcCode" "isInvalid") (includes "aamcCode" showErrorsFor)
           )
         }}
           <span class="validation-error-message">
@@ -75,7 +75,7 @@
         {{#if
           (and
             (v-get this "addressStreet" "isInvalid")
-            (contains "addressStreet" showErrorsFor)
+            (includes "addressStreet" showErrorsFor)
           )
         }}
           <span class="validation-error-message">
@@ -96,7 +96,7 @@
         {{#if
           (and
             (v-get this "addressCity" "isInvalid")
-            (contains "addressCity" showErrorsFor)
+            (includes "addressCity" showErrorsFor)
           )
         }}
           <span class="validation-error-message">
@@ -118,7 +118,7 @@
         {{#if
           (and
             (v-get this "addressStateOrProvince" "isInvalid")
-            (contains "addressStateOrProvince" showErrorsFor)
+            (includes "addressStateOrProvince" showErrorsFor)
           )
         }}
           <span class="validation-error-message">
@@ -139,7 +139,7 @@
         {{#if
           (and
             (v-get this "addressZipCode" "isInvalid")
-            (contains "addressZipCode" showErrorsFor)
+            (includes "addressZipCode" showErrorsFor)
           )
         }}
           <span class="validation-error-message">
@@ -161,7 +161,7 @@
         {{#if
           (and
             (v-get this "addressCountryCode" "isInvalid")
-            (contains "addressCountryCode" showErrorsFor)
+            (includes "addressCountryCode" showErrorsFor)
           )
         }}
           <span class="validation-error-message">
diff --git a/app/components/school-list.hbs b/app/components/school-list.hbs
index 93f577228f..0c86f1259f 100644
--- a/app/components/school-list.hbs
+++ b/app/components/school-list.hbs
@@ -31,13 +31,13 @@
             onkeyup={{action "addErrorDisplayFor" "title"}}
             class={{if
               (and
-                (v-get this "title" "isInvalid") (contains "title" showErrorsFor)
+                (v-get this "title" "isInvalid") (includes "title" showErrorsFor)
               )
               "has-error"
             }}
           >
           {{#if
-            (and (v-get this "title" "isInvalid") (contains "title" showErrorsFor))
+            (and (v-get this "title" "isInvalid") (includes "title" showErrorsFor))
           }}
             <span class="validation-error-message">
               {{v-get this "title" "message"}}
@@ -57,7 +57,7 @@
             class={{if
               (and
                 (v-get this "iliosAdministratorEmail" "isInvalid")
-                (contains "iliosAdministratorEmail" showErrorsFor)
+                (includes "iliosAdministratorEmail" showErrorsFor)
               )
               "has-error"
             }}
@@ -65,7 +65,7 @@
           {{#if
             (and
               (v-get this "iliosAdministratorEmail" "isInvalid")
-              (contains "iliosAdministratorEmail" showErrorsFor)
+              (includes "iliosAdministratorEmail" showErrorsFor)
             )
           }}
             <span class="validation-error-message">
diff --git a/app/components/school-manager.hbs b/app/components/school-manager.hbs
index f3692a90e1..5770114e74 100644
--- a/app/components/school-manager.hbs
+++ b/app/components/school-manager.hbs
@@ -22,7 +22,7 @@
             onkeyup={{action "addErrorDisplayFor" "title"}}
           >
           {{#if
-            (and (v-get this "title" "isInvalid") (contains "title" showErrorsFor))
+            (and (v-get this "title" "isInvalid") (includes "title" showErrorsFor))
           }}
             <span class="validation-error-message">
               {{v-get this "title" "message"}}
diff --git a/app/components/school-session-type-form.hbs b/app/components/school-session-type-form.hbs
index 8ee2f8a25f..23b4c72502 100644
--- a/app/components/school-session-type-form.hbs
+++ b/app/components/school-session-type-form.hbs
@@ -11,7 +11,7 @@
         oninput={{action (mut title) value="target.value"}}
         onkeyup={{action "addErrorDisplayFor" "title"}}
       >
-      {{#if (and (v-get this "title" "isInvalid") (contains "title" showErrorsFor))
+      {{#if (and (v-get this "title" "isInvalid") (includes "title" showErrorsFor))
       }}
         <span class="message error">
           {{v-get this "title" "message"}}
@@ -50,7 +50,7 @@
         {{#if
           (and
             (v-get this "selectedAamcMethodId" "isInvalid")
-            (contains "selectedAamcMethodId" showErrorsFor)
+            (includes "selectedAamcMethodId" showErrorsFor)
           )
         }}
           <span class="message error">
@@ -83,7 +83,7 @@
       {{#if
         (and
           (v-get this "calendarColor" "isInvalid")
-          (contains "calendarColor" showErrorsFor)
+          (includes "calendarColor" showErrorsFor)
         )
       }}
         <span class="message error">
diff --git a/app/components/school-session-types-list.hbs b/app/components/school-session-types-list.hbs
index fe124aae9b..896e71322d 100644
--- a/app/components/school-session-types-list.hbs
+++ b/app/components/school-session-types-list.hbs
@@ -74,7 +74,7 @@
               @click={{action manageSessionType sessionType.id}}
             />
             {{#if (eq sessionType.sessionCount 0)}}
-              {{#if (contains sessionType.id deletedSessionTypes)}}
+              {{#if (includes sessionType.id deletedSessionTypes)}}
                 <LoadingSpinner />
               {{else if canDelete}}
                 <FaIcon
diff --git a/app/components/school-vocabularies-list.hbs b/app/components/school-vocabularies-list.hbs
index e66890456d..4a0579e096 100644
--- a/app/components/school-vocabularies-list.hbs
+++ b/app/components/school-vocabularies-list.hbs
@@ -24,7 +24,7 @@
         {{#if
           (and
             (v-get this "newVocabularyTitle" "isInvalid")
-            (contains "newVocabularyTitle" showErrorsFor)
+            (includes "newVocabularyTitle" showErrorsFor)
           )
         }}
           <span class="validation-error-message">
diff --git a/app/components/school-vocabulary-manager.hbs b/app/components/school-vocabulary-manager.hbs
index 0efa7a360c..65ee84c320 100644
--- a/app/components/school-vocabulary-manager.hbs
+++ b/app/components/school-vocabulary-manager.hbs
@@ -18,7 +18,7 @@
       @close={{action "revertVocabularyTitleChanges"}}
       @isSaveDisabled={{and
         (v-get this "vocabularyTitle" "isInvalid")
-        (contains "vocabularyTitle" showErrorsFor)
+        (includes "vocabularyTitle" showErrorsFor)
       }}
       @saveOnEnter={{true}}
       @closeOnEscape={{true}} as |isSaving|
@@ -33,7 +33,7 @@
     {{#if
       (and
         (v-get this "vocabularyTitle" "isInvalid")
-        (contains "vocabularyTitle" showErrorsFor)
+        (includes "vocabularyTitle" showErrorsFor)
       )
     }}
       <span class="validation-error-message" data-test-title-error-message>
@@ -75,7 +75,7 @@
       {{#if
         (and
           (v-get this "newTermTitle" "isInvalid")
-          (contains "newTermTitle" showErrorsFor)
+          (includes "newTermTitle" showErrorsFor)
         )
       }}
         <span class="validation-error-message" data-test-error-message>
diff --git a/app/components/school-vocabulary-term-manager.hbs b/app/components/school-vocabulary-term-manager.hbs
index 9f41195156..aa5de19339 100644
--- a/app/components/school-vocabulary-term-manager.hbs
+++ b/app/components/school-vocabulary-term-manager.hbs
@@ -41,7 +41,7 @@
       {{/if}}
       {{#if
         (and
-          (v-get this "termTitle" "isInvalid") (contains "termTitle" showErrorsFor)
+          (v-get this "termTitle" "isInvalid") (includes "termTitle" showErrorsFor)
         )
       }}
         <span class="validation-error-message" data-test-title-error-message>
@@ -134,7 +134,7 @@
       {{#if
         (and
           (v-get this "newTermTitle" "isInvalid")
-          (contains "newTermTitle" showErrorsFor)
+          (includes "newTermTitle" showErrorsFor)
         )
       }}
         <span class="validation-error-message" data-test-error-message>
diff --git a/app/components/user-profile-bio.hbs b/app/components/user-profile-bio.hbs
index 671abdc0ac..21ea291b9f 100644
--- a/app/components/user-profile-bio.hbs
+++ b/app/components/user-profile-bio.hbs
@@ -34,7 +34,7 @@
 <div class="form">
   <div
     class="item
-      {{if (contains "firstName" updatedFieldsFromSync) "synced-from-directory"
+      {{if (includes "firstName" updatedFieldsFromSync) "synced-from-directory"
       }}"
   >
     <label>
@@ -50,7 +50,7 @@
       >
       {{#if
         (and
-          (v-get this "firstName" "isInvalid") (contains "firstName" showErrorsFor)
+          (v-get this "firstName" "isInvalid") (includes "firstName" showErrorsFor)
         )
       }}
         <span class="message error">
@@ -78,7 +78,7 @@
       {{#if
         (and
           (v-get this "middleName" "isInvalid")
-          (contains "middleName" showErrorsFor)
+          (includes "middleName" showErrorsFor)
         )
       }}
         <span class="message error">
@@ -93,7 +93,7 @@
   </div>
   <div
     class="item
-      {{if (contains "lastName" updatedFieldsFromSync) "synced-from-directory"
+      {{if (includes "lastName" updatedFieldsFromSync) "synced-from-directory"
       }}"
   >
     <label>
@@ -109,7 +109,7 @@
       >
       {{#if
         (and
-          (v-get this "lastName" "isInvalid") (contains "lastName" showErrorsFor)
+          (v-get this "lastName" "isInvalid") (includes "lastName" showErrorsFor)
         )
       }}
         <span class="message error">
@@ -124,7 +124,7 @@
   </div>
   <div
     class="item
-      {{if (contains "campusId" updatedFieldsFromSync) "synced-from-directory"}}
+      {{if (includes "campusId" updatedFieldsFromSync) "synced-from-directory"}}
        campus-id"
   >
     <label>
@@ -160,7 +160,7 @@
         </button>
         {{#if
           (and
-            (v-get this "campusId" "isInvalid") (contains "campusId" showErrorsFor)
+            (v-get this "campusId" "isInvalid") (includes "campusId" showErrorsFor)
           )
         }}
           <span class="message error">
@@ -192,7 +192,7 @@
         data-test-other-id-input
       >
       {{#if
-        (and (v-get this "otherId" "isInvalid") (contains "otherId" showErrorsFor))
+        (and (v-get this "otherId" "isInvalid") (includes "otherId" showErrorsFor))
       }}
         <span class="message error">
           {{v-get this "otherId" "message"}}
@@ -206,7 +206,7 @@
   </div>
   <div
     class="item
-      {{if (contains "email" updatedFieldsFromSync) "synced-from-directory"}}"
+      {{if (includes "email" updatedFieldsFromSync) "synced-from-directory"}}"
   >
     <label>
       {{t "general.email"}}:
@@ -219,7 +219,7 @@
         onkeyup={{action "addErrorDisplayFor" "email"}}
         data-test-email-input
       >
-      {{#if (and (v-get this "email" "isInvalid") (contains "email" showErrorsFor))
+      {{#if (and (v-get this "email" "isInvalid") (includes "email" showErrorsFor))
       }}
         <span class="message error">
           {{v-get this "email" "message"}}
@@ -234,7 +234,7 @@
   <div
     class="item
       {{if
-        (contains "displayName" updatedFieldsFromSync)
+        (includes "displayName" updatedFieldsFromSync)
         "synced-from-directory"
       }}"
   >
@@ -252,7 +252,7 @@
       {{#if
         (and
           (v-get this "displayName" "isInvalid")
-          (contains "displayName" showErrorsFor)
+          (includes "displayName" showErrorsFor)
         )
       }}
         <span class="message error">
@@ -268,7 +268,7 @@
   <div
     class="item
       {{if
-        (contains "preferredEmail" updatedFieldsFromSync)
+        (includes "preferredEmail" updatedFieldsFromSync)
         "synced-from-directory"
       }}"
   >
@@ -286,7 +286,7 @@
       {{#if
         (and
           (v-get this "preferredEmail" "isInvalid")
-          (contains "preferredEmail" showErrorsFor)
+          (includes "preferredEmail" showErrorsFor)
         )
       }}
         <span class="message error">
@@ -301,7 +301,7 @@
   </div>
   <div
     class="item
-      {{if (contains "phone" updatedFieldsFromSync) "synced-from-directory"}}"
+      {{if (includes "phone" updatedFieldsFromSync) "synced-from-directory"}}"
   >
     <label>
       {{t "general.phone"}}:
@@ -314,7 +314,7 @@
         onkeyup={{action "addErrorDisplayFor" "phone"}}
         data-test-phone-input
       >
-      {{#if (and (v-get this "phone" "isInvalid") (contains "phone" showErrorsFor))
+      {{#if (and (v-get this "phone" "isInvalid") (includes "phone" showErrorsFor))
       }}
         <span class="message error">
           {{v-get this "phone" "message"}}
@@ -328,7 +328,7 @@
   </div>
   <div
     class="item
-      {{if (contains "username" updatedFieldsFromSync) "synced-from-directory"
+      {{if (includes "username" updatedFieldsFromSync) "synced-from-directory"
       }}"
   >
     <label>
@@ -345,7 +345,7 @@
       >
       {{#if
         (and
-          (v-get this "username" "isInvalid") (contains "username" showErrorsFor)
+          (v-get this "username" "isInvalid") (includes "username" showErrorsFor)
         )
       }}
         <span class="message error">
@@ -372,7 +372,7 @@
             onkeyup={{action "addErrorDisplayFor" "password"}}
             data-test-password-input
           >
-          {{#if (and (v-get this "password" "isInvalid") (contains "password" showErrorsFor))}}
+          {{#if (and (v-get this "password" "isInvalid") (includes "password" showErrorsFor))}}
             <span class="message error">
               {{v-get this "password" "message"}}
             </span>
diff --git a/app/templates/pending-user-updates.hbs b/app/templates/pending-user-updates.hbs
index d3beaa29e9..941aee4dc9 100644
--- a/app/templates/pending-user-updates.hbs
+++ b/app/templates/pending-user-updates.hbs
@@ -69,7 +69,7 @@
                 </td>
                 <td></td>
                 <td class="text-left" colspan="2">
-                  {{#if (contains update this.updatesBeingSaved)}}
+                  {{#if (includes update this.updatesBeingSaved)}}
                     <LoadingSpinner />
                   {{else}}
                     {{#if (eq update.type "emailMismatch")}}