diff --git a/tests/acceptance/features/bootstrap/WebUIAdminSharingSettingsContext.php b/tests/acceptance/features/bootstrap/WebUIAdminSharingSettingsContext.php
index 565d442d3fb0..96a76e436d4e 100644
--- a/tests/acceptance/features/bootstrap/WebUIAdminSharingSettingsContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIAdminSharingSettingsContext.php
@@ -220,15 +220,15 @@ public function theAdministratorEnablesExcludeGroupsFromSharingUsingTheWebui() {
 	}
 
 	/**
-	 * @When the administrator adds group :group to the group sharing blacklist using the webUI
-	 * @Given the administrator has added group :group to the group sharing blacklist from the admin sharing settings page
+	 * @When the administrator adds group :group to the exclude group from sharing list using the webUI
+	 * @Given the administrator has added group :group to the exclude group from sharing list from the admin sharing settings page
 	 *
 	 * @param string $group
 	 *
 	 * @return void
 	 */
-	public function theAdministratorAddsGroupToTheGroupSharingBlacklistUsingTheWebui($group) {
-		$this->adminSharingSettingsPage->addGroupToGroupSharingBlacklist(
+	public function theAdministratorAddsGroupToTheExcludeGroupFromSharingList($group) {
+		$this->adminSharingSettingsPage->addGroupToExcludeGroupsFromSharingList(
 			$this->getSession(), $group
 		);
 	}
diff --git a/tests/acceptance/features/lib/AdminSharingSettingsPage.php b/tests/acceptance/features/lib/AdminSharingSettingsPage.php
index 043e220e5629..9401e0f02965 100644
--- a/tests/acceptance/features/lib/AdminSharingSettingsPage.php
+++ b/tests/acceptance/features/lib/AdminSharingSettingsPage.php
@@ -60,7 +60,7 @@ class AdminSharingSettingsPage extends SharingSettingsPage {
 	protected $excludeGroupFromSharingCheckboxXpath = '//label[@for="shareapiExcludeGroups"]';
 	protected $excludeGroupFromSharingCheckboxId = 'shareapiExcludeGroups';
 
-	protected $groupSharingBlackListFieldXpath = '//p[@id="selectExcludedGroups"]//input[contains(@class,"select2-input")]';
+	protected $excludeGroupsFromSharingListFieldXpath = '//p[@id="selectExcludedGroups"]//input[contains(@class,"select2-input")]';
 	protected $excludeGroupFromSharesFieldXpath = '//div[@id="files_sharing"]//input[contains(@class,"select2-input")]';
 	protected $groupListXpath = '//div[@id="select2-drop"]//li[contains(@class, "select2-result")]';
 	protected $groupListDropDownXpath = "//div[@id='select2-drop']";
@@ -284,8 +284,10 @@ public function enableExcludeGroupFromSharing(Session $session) {
 	 *
 	 * @return void
 	 */
-	public function addGroupToGroupSharingBlacklist(Session $session, $groupName) {
-		$this->addGroupToInputField($groupName, $this->groupSharingBlackListFieldXpath);
+	public function addGroupToExcludeGroupsFromSharingList(
+		Session $session, $groupName
+	) {
+		$this->addGroupToInputField($groupName, $this->excludeGroupsFromSharingListFieldXpath);
 		$this->waitForAjaxCallsToStartAndFinish($session);
 	}
 
diff --git a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
index 15a8a556e727..0107a7fc6b2a 100644
--- a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
@@ -150,7 +150,7 @@ Feature: Sharing files and folders with internal users
     And user "user1" has been added to group "grp1"
     And the administrator has browsed to the admin sharing settings page
     When the administrator enables exclude groups from sharing using the webUI
-    And the administrator adds group "grp1" to the group sharing blacklist using the webUI
+    And the administrator adds group "grp1" to the exclude group from sharing list using the webUI
     Then user "user1" should not be able to share file "testimage.jpg" with user "user3" using the sharing API
 
   Scenario: user tries to share a folder from a group which is blacklisted from sharing
@@ -163,7 +163,7 @@ Feature: Sharing files and folders with internal users
     And user "user1" has been added to group "grp1"
     And the administrator has browsed to the admin sharing settings page
     When the administrator enables exclude groups from sharing using the webUI
-    And the administrator adds group "grp1" to the group sharing blacklist using the webUI
+    And the administrator adds group "grp1" to the exclude group from sharing list using the webUI
     Then user "user1" should not be able to share folder "simple-folder" with user "User Three" using the sharing API
 
   Scenario: member of a blacklisted from sharing group tries to re-share a file received as a share
@@ -180,7 +180,7 @@ Feature: Sharing files and folders with internal users
     And the administrator has browsed to the admin sharing settings page
     And user "user3" has shared file "/testimage.jpg" with user "user1"
     And the administrator has enabled exclude groups from sharing from the admin sharing settings page
-    When the administrator adds group "grp1" to the group sharing blacklist using the webUI
+    When the administrator adds group "grp1" to the exclude group from sharing list using the webUI
     Then user "user1" should not be able to share file "/testimage (2).jpg" with user "User Four" using the sharing API
 
   Scenario: member of a blacklisted from sharing group tries to re-share a folder received as a share
@@ -196,7 +196,7 @@ Feature: Sharing files and folders with internal users
     And user "user3" has created folder "/common"
     And user "user3" has shared folder "/common" with user "user1"
     And the administrator has enabled exclude groups from sharing from the admin sharing settings page
-    When the administrator adds group "grp1" to the group sharing blacklist using the webUI
+    When the administrator adds group "grp1" to the exclude group from sharing list using the webUI
     Then user "user1" should not be able to share folder "/common" with user "User Four" using the sharing API
 
   Scenario: member of a blacklisted from sharing group tries to re-share a file inside a folder received as a share
@@ -213,7 +213,7 @@ Feature: Sharing files and folders with internal users
     And user "user3" has moved file "/testimage.jpg" to "/common/testimage.jpg"
     And user "user3" has shared folder "/common" with user "user1"
     And the administrator has enabled exclude groups from sharing from the admin sharing settings page
-    When the administrator adds group "grp1" to the group sharing blacklist using the webUI
+    When the administrator adds group "grp1" to the exclude group from sharing list using the webUI
     Then user "user1" should not be able to share file "/common/testimage.jpg" with user "User Four" using the sharing API
 
   Scenario: member of a blacklisted from sharing group tries to re-share a folder inside a folder received as a share
@@ -228,7 +228,7 @@ Feature: Sharing files and folders with internal users
     And user "user3" has created folder "/common/inside-common"
     And user "user3" has shared folder "/common" with user "user1"
     And the administrator has enabled exclude groups from sharing from the admin sharing settings page
-    When the administrator adds group "grp1" to the group sharing blacklist using the webUI
+    When the administrator adds group "grp1" to the exclude group from sharing list using the webUI
     Then user "user1" should not be able to share folder "/common/inside-common" with user "User Four" using the sharing API
 
   Scenario: user tries to share a file from a group which is blacklisted from sharing using webUI from files page
@@ -237,7 +237,7 @@ Feature: Sharing files and folders with internal users
     And user "user1" has been added to group "grp1"
     And the administrator has browsed to the admin sharing settings page
     And the administrator has enabled exclude groups from sharing from the admin sharing settings page
-    When the administrator adds group "grp1" to the group sharing blacklist using the webUI
+    When the administrator adds group "grp1" to the exclude group from sharing list using the webUI
     And the user re-logs in as "user1" using the webUI
     And the user opens the sharing tab from the file action menu of file "testimage.jpg" using the webUI
     Then the user should see an error message on the share dialog saying "Sharing is not allowed"
@@ -254,7 +254,7 @@ Feature: Sharing files and folders with internal users
     And user "user2" has shared file "/testimage.jpg" with user "user1"
     And the administrator has browsed to the admin sharing settings page
     And the administrator has enabled exclude groups from sharing from the admin sharing settings page
-    When the administrator adds group "grp1" to the group sharing blacklist using the webUI
+    When the administrator adds group "grp1" to the exclude group from sharing list using the webUI
     And the user re-logs in as "user1" using the webUI
     And the user browses to the shared-with-you page
     And the user opens the sharing tab from the file action menu of file "testimage (2).jpg" using the webUI