diff --git a/e2e/content-services/components/permissions-component.e2e.ts b/e2e/content-services/components/permissions-component.e2e.ts
index 211e2d47598..7ddd45a9f54 100644
--- a/e2e/content-services/components/permissions-component.e2e.ts
+++ b/e2e/content-services/components/permissions-component.e2e.ts
@@ -339,8 +339,8 @@ describe('Permissions Component', () => {
             await BrowserActions.closeMenuAndDialogs();
             await contentList.checkActionMenuIsNotDisplayed();
             await contentServicesPage.metadataContent('RoleEditor' + fileModel.name);
-            await metadataViewPage.editIconIsDisplayed();
-            await metadataViewPage.editIconClick();
+            await metadataViewPage.isEditGeneralIconDisplayed();
+            await metadataViewPage.clickEditIconGeneral();
             await metadataViewPage.editPropertyIconIsDisplayed('properties.cm:title');
             await metadataViewPage.enterPropertyText('properties.cm:title', 'newTitle1');
             await expect(await metadataViewPage.getPropertyText('properties.cm:title')).toEqual('newTitle1');
@@ -360,8 +360,8 @@ describe('Permissions Component', () => {
             await BrowserActions.closeMenuAndDialogs();
             await contentList.checkActionMenuIsNotDisplayed();
             await contentServicesPage.metadataContent('RoleCollaborator' + fileModel.name);
-            await metadataViewPage.editIconIsDisplayed();
-            await metadataViewPage.editIconClick();
+            await metadataViewPage.isEditGeneralIconDisplayed();
+            await metadataViewPage.clickEditIconGeneral();
             await metadataViewPage.editPropertyIconIsDisplayed('properties.cm:title');
             await metadataViewPage.enterPropertyText('properties.cm:title', 'newTitle2');
             await expect(await metadataViewPage.getPropertyText('properties.cm:title')).toEqual('newTitle2');
@@ -382,8 +382,8 @@ describe('Permissions Component', () => {
             await viewerPage.clickCloseButton();
             await contentList.waitForTableBody();
             await contentServicesPage.metadataContent('RoleCoordinator' + fileModel.name);
-            await metadataViewPage.editIconIsDisplayed();
-            await metadataViewPage.editIconClick();
+            await metadataViewPage.isEditGeneralIconDisplayed();
+            await metadataViewPage.clickEditIconGeneral();
             await metadataViewPage.editPropertyIconIsDisplayed('properties.cm:title');
             await metadataViewPage.enterPropertyText('properties.cm:title', 'newTitle3');
             await expect(await metadataViewPage.getPropertyText('properties.cm:title')).toEqual('newTitle3');
@@ -398,7 +398,7 @@ describe('Permissions Component', () => {
             await contentServicesPage.checkContentIsNotDisplayed('RoleCoordinator' + fileModel.name);
         });
 
-        it('[C279881] No Permission User', async () => {
+        fit('[C279881] No Permission User', async () => {
             await loginPage.login(filePermissionUser.username, filePermissionUser.password);
             await navigationBarPage.openContentServicesFolder(roleConsumerFolder.entry.id);
             await contentServicesPage.checkContentIsDisplayed('RoleConsumer' + fileModel.name);
diff --git a/e2e/core/viewer/viewer-content-services-component.e2e.ts b/e2e/core/viewer/viewer-content-services-component.e2e.ts
index f0aadfd7fb8..05591d7009a 100644
--- a/e2e/core/viewer/viewer-content-services-component.e2e.ts
+++ b/e2e/core/viewer/viewer-content-services-component.e2e.ts
@@ -446,9 +446,9 @@ describe('Content Services Viewer', () => {
         await viewerPage.checkInfoSideBarIsDisplayed();
         await viewerPage.clickOnTab('Properties');
         await viewerPage.checkTabIsActive('Properties');
-        await metadataViewPage.editIconClick();
+        await metadataViewPage.clickEditIconGeneral();
         await metadataViewPage.enterPropertyText('properties.cm:name', newName);
-        await metadataViewPage.clickSaveMetadata();
+        await metadataViewPage.clickSaveGeneralMetadata();
         await viewerPage.clickCloseButton();
     }
 });