diff --git a/cypress/integration/common/view/add_a_FILTERTYPE_filter.js b/cypress/integration/common/view/add_a_FILTERTYPE_filter.js
index 48993c2c8..3e8fc7381 100644
--- a/cypress/integration/common/view/add_a_FILTERTYPE_filter.js
+++ b/cypress/integration/common/view/add_a_FILTERTYPE_filter.js
@@ -19,7 +19,7 @@ When('I add a {string} filter', dimensionType => {
     // select an item in the modal
     if (dimensionType === 'Period') {
         cy.get(unselectedItemsSel).contains(PERIOD).dblclick()
-    } else if (dimensionType === 'Organisation Unit') {
+    } else if (dimensionType === 'Organisation unit') {
         cy.get(orgUnitTreeSel, EXTENDED_TIMEOUT)
             .find('[type="checkbox"]', EXTENDED_TIMEOUT)
             .check(OU_ID)
diff --git a/cypress/integration/edit/filter_restrict.feature b/cypress/integration/edit/filter_restrict.feature
index 29711c3cb..e616c5df0 100644
--- a/cypress/integration/edit/filter_restrict.feature
+++ b/cypress/integration/edit/filter_restrict.feature
@@ -17,11 +17,11 @@ Feature: Editing Filter Restrictions
         Then Filter Restrictions are not restricted
 
     @nonmutating
-    Scenario: I see Period and Organisation Unit if newly choosing to restrict dimensions
+    Scenario: I see Period and Organisation unit if newly choosing to restrict dimensions
         Given I open an existing dashboard with non-restricted Filter settings in edit mode
         And I click on Filter settings
         And I click to restrict Filter settings
-        Then Period and Organisation Unit are displayed as selected by default
+        Then Period and Organisation unit are displayed as selected by default
 
     @nonmutating
     Scenario: I change Filter Restrictions and the changes persist while editing Filter settings
diff --git a/cypress/integration/edit/filter_restrict/filter_restrict.js b/cypress/integration/edit/filter_restrict/filter_restrict.js
index 80be3dfc3..453584c8e 100644
--- a/cypress/integration/edit/filter_restrict/filter_restrict.js
+++ b/cypress/integration/edit/filter_restrict/filter_restrict.js
@@ -75,11 +75,11 @@ Then('Filter Restrictions are not restricted', () => {
 })
 
 /*
-Scenario: I see Period and Organisation Unit if newly choosing to restrict dimensions
+Scenario: I see Period and Organisation unit if newly choosing to restrict dimensions
 */
 
 Then(
-    'Period and Organisation Unit are displayed as selected by default',
+    'Period and Organisation unit are displayed as selected by default',
     () => {
         cy.get('[data-test="dhis2-uicore-transfer-rightside"]')
             .contains('Period')
diff --git a/cypress/integration/view/dashboard_filter.feature b/cypress/integration/view/dashboard_filter.feature
index 00c1fcf8e..b40594040 100644
--- a/cypress/integration/view/dashboard_filter.feature
+++ b/cypress/integration/view/dashboard_filter.feature
@@ -7,11 +7,11 @@ Feature: Dashboard filter
         When I add a "Period" filter
         Then the Period filter is applied to the dashboard
 
-    Scenario: I add a Organisation Unit filter
+    Scenario: I add a Organisation unit filter
         Given I open existing dashboard
         Then the dashboard displays in view mode
-        When I add a "Organisation Unit" filter
-        Then the Organisation Unit filter is applied to the dashboard
+        When I add a "Organisation unit" filter
+        Then the Organisation unit filter is applied to the dashboard
 
     Scenario: I add a Facility Type filter
         Given I open existing dashboard
diff --git a/cypress/integration/view/dashboard_filter/dashboard_filter.js b/cypress/integration/view/dashboard_filter/dashboard_filter.js
index d59db80f3..655f317b7 100644
--- a/cypress/integration/view/dashboard_filter/dashboard_filter.js
+++ b/cypress/integration/view/dashboard_filter/dashboard_filter.js
@@ -42,12 +42,12 @@ Then('the Period filter is applied to the dashboard', () => {
 })
 
 /*
-Scenario: I add an Organisation Unit filter
+Scenario: I add an Organisation unit filter
 */
 
-Then('the Organisation Unit filter is applied to the dashboard', () => {
+Then('the Organisation unit filter is applied to the dashboard', () => {
     cy.get(filterBadgeSel)
-        .contains(`Organisation Unit: ${OU}`)
+        .contains(`Organisation unit: ${OU}`)
         .should('be.visible')
 
     cy.get(innerScrollContainerSel).scrollTo('bottom')