diff --git a/e2e/playwright/authentication/src/tests/general.e2e.ts b/e2e/playwright/authentication/src/tests/general.e2e.ts
index bd350f4ba..c00dc4a7a 100644
--- a/e2e/playwright/authentication/src/tests/general.e2e.ts
+++ b/e2e/playwright/authentication/src/tests/general.e2e.ts
@@ -39,7 +39,7 @@ test.describe('Create folders', () => {
   });
 
   test.beforeEach(async () => {
-    randomFolderName = `playwright-folder-${Utils.random()}`;
+    randomFolderName = `authentication-general-${Utils.random()}`;
     await apiClientFactory.loginUser(sessionTestUser);
   });
 
diff --git a/e2e/playwright/create-actions/src/tests/create-folder-from-template.e2e.ts b/e2e/playwright/create-actions/src/tests/create-folder-from-template.e2e.ts
index 247c516a9..6ebd0f62a 100644
--- a/e2e/playwright/create-actions/src/tests/create-folder-from-template.e2e.ts
+++ b/e2e/playwright/create-actions/src/tests/create-folder-from-template.e2e.ts
@@ -77,7 +77,7 @@ test.describe('Create folder from template', () => {
   const fileInRestrictedFolder = `restricted-file-${random}.txt`;
 
   const createDialogTitle = `Create new folder from '${templateFolder1}'`;
-  const commonFolderName = `playwright-folder-${Utils.random()}`;
+  const commonFolderName = `create-actions-template-${Utils.random()}`;
 
   const templates: NodeContentTree = {
     folders: [
@@ -358,7 +358,7 @@ test.describe('Create folder from template', () => {
     test.describe('Folder created from template on Personal Files', () => {
       test.beforeEach(async ({ personalFiles }) => {
         try {
-          randomFolderName = `playwright-folder-${Utils.random()}`;
+          randomFolderName = `create-actions-template-${Utils.random()}`;
           randomFolderTitle = `folder-title-${Utils.random()}`;
           randomFolderDescription = `folder-description-${Utils.random()}`;
           createFolderFromTemplateDialog = personalFiles.createFromTemplateDialogComponent;
@@ -410,7 +410,7 @@ test.describe('Create folder from template', () => {
 
     test.beforeEach(async ({ myLibrariesPage }) => {
       try {
-        randomFolderName = `playwright-folder-${Utils.random()}`;
+        randomFolderName = `create-actions-template-${Utils.random()}`;
         randomFolderTitle = `folder-title-${Utils.random()}`;
         randomFolderDescription = `folder-description-${Utils.random()}`;
         await myLibrariesPage.navigate();
diff --git a/e2e/playwright/create-actions/src/tests/create-folder.e2e.ts b/e2e/playwright/create-actions/src/tests/create-folder.e2e.ts
index 0de358686..ce790cdef 100644
--- a/e2e/playwright/create-actions/src/tests/create-folder.e2e.ts
+++ b/e2e/playwright/create-actions/src/tests/create-folder.e2e.ts
@@ -47,7 +47,7 @@ test.describe('Create folders', () => {
   const dialogString = 'dialog';
   const createNewFolderString = 'Create new folder';
   const spacesString = '   ';
-  const commonFolderName = `playwright-folder-${Utils.random()}`;
+  const commonFolderName = `create-folder-${Utils.random()}`;
   const username = `user-${Utils.random()}`;
 
   test.beforeAll(async () => {
@@ -63,7 +63,7 @@ test.describe('Create folders', () => {
   });
 
   test.beforeEach(async ({ personalFiles, page }) => {
-    randomFolderName = `playwright-folder-${Utils.random()}`;
+    randomFolderName = `create-folder-${Utils.random()}`;
     randomFolderTitle = `folder-title-${Utils.random()}`;
     randomFolderDescription = `folder-description-${Utils.random()}`;
     folderDialog = personalFiles.folderDialog;
diff --git a/e2e/playwright/folder-rules/src/tests/actions.e2e.ts b/e2e/playwright/folder-rules/src/tests/actions.e2e.ts
index d7b5bb7a1..961aad494 100644
--- a/e2e/playwright/folder-rules/src/tests/actions.e2e.ts
+++ b/e2e/playwright/folder-rules/src/tests/actions.e2e.ts
@@ -28,7 +28,7 @@ import { ActionType, ApiClientFactory, getUserState, test, Utils } from '@alfres
 test.use({ storageState: getUserState('hruser') });
 test.describe('Folder Rules Actions', () => {
   const apiClientFactory = new ApiClientFactory();
-  const randomFolderName = `playwright-folder-${Utils.random()}`;
+  const randomFolderName = `folder-rules-actions-${Utils.random()}`;
   const randomRuleName = `playwright-rule-${Utils.random()}`;
   const checkInValue = 'check In Value';
   const actionValue = ' A site which contains sfdc content [sfdc:site] ';
diff --git a/e2e/playwright/folder-rules/src/tests/conditions.e2e.ts b/e2e/playwright/folder-rules/src/tests/conditions.e2e.ts
index f9415175e..010673bf4 100644
--- a/e2e/playwright/folder-rules/src/tests/conditions.e2e.ts
+++ b/e2e/playwright/folder-rules/src/tests/conditions.e2e.ts
@@ -28,7 +28,7 @@ import { ActionType, ApiClientFactory, Comparator, Field, getUserState, test, Ut
 test.use({ storageState: getUserState('hruser') });
 test.describe('Folder Rules Conditions', () => {
   const apiClientFactory = new ApiClientFactory();
-  const randomFolderName = `playwright-folder-${Utils.random()}`;
+  const randomFolderName = `folder-rules-conditions-${Utils.random()}`;
   const randomRuleName = `playwright-rule-${Utils.random()}`;
   const specialChars = '!@£$%^&*()~#/';
 
diff --git a/e2e/playwright/folder-rules/src/tests/manage-rules.e2e.ts b/e2e/playwright/folder-rules/src/tests/manage-rules.e2e.ts
index 073fcab98..bb914471e 100644
--- a/e2e/playwright/folder-rules/src/tests/manage-rules.e2e.ts
+++ b/e2e/playwright/folder-rules/src/tests/manage-rules.e2e.ts
@@ -28,7 +28,7 @@ import { expect } from '@playwright/test';
 test.use({ storageState: getUserState('hruser') });
 test.describe('Rules - Manage Rules', () => {
   const apiClientFactory = new ApiClientFactory();
-  const randomName = `playwright-folder-${Utils.random()}`;
+  const randomName = `folder-rules-manage-rules-${Utils.random()}`;
   const randomRuleName = `playwright-rule-${Utils.random()}`;
 
   let folderId: string;
diff --git a/e2e/playwright/viewer/src/tests/viewer-action.e2e.ts b/e2e/playwright/viewer/src/tests/viewer-action.e2e.ts
index 8bbc0ef83..50d979b44 100644
--- a/e2e/playwright/viewer/src/tests/viewer-action.e2e.ts
+++ b/e2e/playwright/viewer/src/tests/viewer-action.e2e.ts
@@ -28,7 +28,7 @@ import { ApiClientFactory, getUserState, test, TEST_FILES, timeouts, Utils } fro
 test.use({ storageState: getUserState('hruser') });
 test.describe('viewer action file', () => {
   const apiClientFactory = new ApiClientFactory();
-  const randomFolderName = `playwright-folder-${Utils.random()}`;
+  const randomFolderName = `viewer-action-${Utils.random()}`;
   const randomDocxName = `${TEST_FILES.DOCX.name}-${Utils.random()}`;
   const randomDocxNameFavorite = `${TEST_FILES.DOCX.name}-${Utils.random()}`;
   const randomDocxNameShare = `${TEST_FILES.DOCX.name}-${Utils.random()}`;
@@ -45,7 +45,7 @@ test.describe('viewer action file', () => {
   let filePersonalFilesId: string;
   const fileForUploadNewVersion2 = `file4-${Utils.random()}.docx`;
   let fileForUploadNewVersionId2: string;
-  const destination = `destRF-${Utils.random()}`;
+  const destination = `viewer-action-destRF-${Utils.random()}`;
   let destinationId: string;
   const docxRecentFiles = `docxRF-${Utils.random()}.docx`;
 
diff --git a/e2e/playwright/viewer/src/tests/viewer-protected.e2e.ts b/e2e/playwright/viewer/src/tests/viewer-protected.e2e.ts
index 62be62261..95e951699 100644
--- a/e2e/playwright/viewer/src/tests/viewer-protected.e2e.ts
+++ b/e2e/playwright/viewer/src/tests/viewer-protected.e2e.ts
@@ -28,7 +28,7 @@ import { ApiClientFactory, getUserState, test, TEST_FILES, Utils } from '@alfres
 test.use({ storageState: getUserState('hruser') });
 test.describe('viewer file', () => {
   const apiClientFactory = new ApiClientFactory();
-  const randomFolderName = `playwright-folder-${Utils.random()}`;
+  const randomFolderName = `viewer-protected-${Utils.random()}`;
   const randomDocxName = `${TEST_FILES.PDF_PROTECTED.name}-${Utils.random()}`;
   let folderId: string;
   let fileDocxId: string;
diff --git a/e2e/playwright/viewer/src/tests/viewer.e2e.ts b/e2e/playwright/viewer/src/tests/viewer.e2e.ts
index 48518a69d..0e1f00b7a 100644
--- a/e2e/playwright/viewer/src/tests/viewer.e2e.ts
+++ b/e2e/playwright/viewer/src/tests/viewer.e2e.ts
@@ -55,7 +55,7 @@ test.describe('viewer file', () => {
 
   test.beforeAll(async () => {
     test.setTimeout(timeouts.extendedTest);
-    const randomFolderName = `playwright-folder-${Utils.random()}`;
+    const randomFolderName = `viewer-${Utils.random()}`;
     const apiClientFactory = new ApiClientFactory();
     await apiClientFactory.setUpAcaBackend('admin');
     await apiClientFactory.createUser({ username });