diff --git a/lib/helpers/ContentUiHelper.ts b/lib/helpers/ContentUiHelper.ts
index bec45a3..5b8e00f 100644
--- a/lib/helpers/ContentUiHelper.ts
+++ b/lib/helpers/ContentUiHelper.ts
@@ -179,7 +179,7 @@ export class ContentUiHelper extends UiBaseLocators {
     this.linkTitleTxt = this.linkPickerModal.getByLabel('Title');
     this.tagItems = page.locator('uui-tag');
     this.removeFilesBtn = page.locator('umb-input-upload-field [label="Remove file(s)"]');
-    this.toggleBtn = page.locator('umb-property-editor-ui-toggle #slider');
+    this.toggleBtn = page.locator('umb-property-editor-ui-toggle #toggle');
     this.toggleInput = page.locator('umb-property-editor-ui-toggle span');
     this.documentTypeWorkspace = this.sidebarModal.locator('umb-document-type-workspace-editor');
     this.addMultipleTextStringBtn = page.locator('umb-input-multiple-text-string').getByLabel('Add');
diff --git a/lib/helpers/DataTypeUiHelper.ts b/lib/helpers/DataTypeUiHelper.ts
index b11368a..524f8e1 100644
--- a/lib/helpers/DataTypeUiHelper.ts
+++ b/lib/helpers/DataTypeUiHelper.ts
@@ -8,10 +8,10 @@ export class DataTypeUiHelper extends UiBaseLocators {
   private readonly dataTypeNameTxt: Locator;
   private readonly createDataTypeFolderBtn: Locator;
   private readonly updateDataTypeFolderBtn: Locator;
-  private readonly includeLabelsSlider: Locator;
+  private readonly includeLabelsToggle: Locator;
   private readonly addColorBtn: Locator;
   private readonly colorValueTxt: Locator;
-  private readonly offsetTimeSlider: Locator;
+  private readonly offsetTimeToggle: Locator;
   private readonly dateFormatTxt: Locator;
   private readonly pageSizeTxt: Locator;
   private readonly ascendingRadioBtn: Locator;
@@ -19,8 +19,8 @@ export class DataTypeUiHelper extends UiBaseLocators {
   private readonly chooseColumnsDisplayedBtn: Locator;
   private readonly workspaceViewName: Locator;
   private readonly orderByDropDownBox: Locator;
-  private readonly showWorkspaceViewFirstSlider: Locator;
-  private readonly editInInfiniteEditorSlider: Locator;
+  private readonly showWorkspaceViewFirstToggle: Locator;
+  private readonly editInInfiniteEditorToggle: Locator;
   private readonly aliasTxt: Locator;
   private readonly widthTxt: Locator;
   private readonly heightTxt: Locator;
@@ -39,11 +39,11 @@ export class DataTypeUiHelper extends UiBaseLocators {
   private readonly addAcceptedFileExtensionsBtn: Locator;
   private readonly minimumNumberOfItemsTxt: Locator;
   private readonly maximumNumberOfItemsTxt: Locator;
-  private readonly ignoreUserStartNodesSlider: Locator;
+  private readonly ignoreUserStartNodesToggle: Locator;
   private readonly overlaySizeDropDownBox: Locator;
-  private readonly hideAnchorQueryStringInputSlider: Locator;
-  private readonly pickMultipleItemsSlider: Locator;
-  private readonly enableFocalPointSlider: Locator;
+  private readonly hideAnchorQueryStringInputToggle: Locator;
+  private readonly pickMultipleItemsToggle: Locator;
+  private readonly enableFocalPointToggle: Locator;
   private readonly amountLowValueTxt: Locator;
   private readonly amountHighValueTxt: Locator;
   private readonly toolbarCheckboxes: Locator;
@@ -51,20 +51,20 @@ export class DataTypeUiHelper extends UiBaseLocators {
   private readonly dimensionsWidthTxt: Locator;
   private readonly dimensionsHeightTxt: Locator;
   private readonly maxImageSizeTxt: Locator;
-  private readonly hideLabelSlider: Locator;
+  private readonly hideLabelToggle: Locator;
   private readonly defineTagGroupTxt: Locator;
-  private readonly showOpenButtonSlider: Locator;
-  private readonly enableMultipleChoiceSlider: Locator;
+  private readonly showOpenButtonToggle: Locator;
+  private readonly enableMultipleChoiceToggle: Locator;
   private readonly addOptionsBtn: Locator;
-  private readonly presetValueSlider: Locator;
-  private readonly showToggleLabelsSlider: Locator;
+  private readonly presetValueToggle: Locator;
+  private readonly showToggleLabelsToggle: Locator;
   private readonly labelOnTxt: Locator;
   private readonly labelOffTxt: Locator;
   private readonly labelTxt: Locator;
   private readonly chooseAcceptedTypesBtn: Locator;
   private readonly chooseWithPlusBtn: Locator;
   private readonly storageTypeDropDownBox: Locator;
-  private readonly allowDecimalsSlider: Locator;
+  private readonly allowDecimalsToggle: Locator;
   private readonly chooseLayoutsBtn: Locator;
   private readonly columnsDisplayedItems: Locator;
   private readonly layoutsItems: Locator;
@@ -141,18 +141,18 @@ export class DataTypeUiHelper extends UiBaseLocators {
     this.createDataTypeFolderBtn = page.getByLabel('Create folder');
     this.newFolderBtn = page.locator('[name="Folder"]');
     this.updateDataTypeFolderBtn = page.getByLabel('Update folder');
-    this.ignoreUserStartNodesSlider = page.locator('[data-mark="property:ignoreUserStartNodes"] #slider');
+    this.ignoreUserStartNodesToggle = page.locator('[data-mark="property:ignoreUserStartNodes"] #toggle');
     this.duplicateBtn = this.sidebarModal.getByLabel('Duplicate', {exact: true});
     this.selectAPropertyEditorBtn = page.getByLabel('Select a property editor');
     this.typeToFilterTxt = page.locator('#filter #input');
 
     // Approved Color
-    this.includeLabelsSlider = page.locator('#slider');
+    this.includeLabelsToggle = page.locator('#toggle');
     this.addColorBtn = page.getByLabel('Add');
     this.colorValueTxt = page.getByPlaceholder('Value').getByRole('textbox');
 
     // Date Picker
-    this.offsetTimeSlider = page.locator('umb-property[label="Offset time"] #slider');
+    this.offsetTimeToggle = page.locator('umb-property[label="Offset time"] #toggle');
     this.dateFormatTxt = page.locator('[data-mark="property:format"] #input');
 
     // List View
@@ -162,8 +162,8 @@ export class DataTypeUiHelper extends UiBaseLocators {
     this.chooseColumnsDisplayedBtn = page.locator('[data-mark="property:includeProperties"]').getByLabel('Choose');
     this.columnsDisplayedItems = page.locator('[data-mark="property:includeProperties"] .layout-item');
     this.workspaceViewName = page.locator('[data-mark="property:tabName"] #input');
-    this.showWorkspaceViewFirstSlider = page.locator('[data-mark="property:showContentFirst"] #slider');
-    this.editInInfiniteEditorSlider = page.locator('umb-property[label="Edit in Infinite Editor"] #slider');
+    this.showWorkspaceViewFirstToggle = page.locator('[data-mark="property:showContentFirst"] #toggle');
+    this.editInInfiniteEditorToggle = page.locator('umb-property[label="Edit in Infinite Editor"] #toggle');
     this.orderByDropDownBox = page.locator('[data-mark="property:orderBy"] select');
     this.chooseLayoutsBtn = page.locator('[data-mark="property:layouts"]').getByLabel('Choose');
     this.layoutsItems = page.locator('[data-mark="property:layouts"] .layout-item');
@@ -180,7 +180,7 @@ export class DataTypeUiHelper extends UiBaseLocators {
     this.minimumTxt = page.locator('[data-mark="property:min"] #input');
     this.maximumTxt = page.locator('[data-mark="property:max"] #input');
     this.stepSizeTxt = page.locator('[data-mark="property:step"] #input');
-    this.allowDecimalsSlider = page.locator('umb-property[label="Allow decimals"] #slider');
+    this.allowDecimalsToggle = page.locator('umb-property[label="Allow decimals"] #toggle');
 
     // Radiobox
     this.optionTxt = page.locator('[data-mark="property:items"] #input');
@@ -200,11 +200,11 @@ export class DataTypeUiHelper extends UiBaseLocators {
     this.minimumNumberOfItemsTxt = page.locator('[data-mark="property:minNumber"] #input');
     this.maximumNumberOfItemsTxt = page.locator('[data-mark="property:maxNumber"] #input');
     this.overlaySizeDropDownBox = page.locator('[data-mark="property:overlaySize"] select');
-    this.hideAnchorQueryStringInputSlider = page.locator('[data-mark="property:hideAnchor"] #slider');
+    this.hideAnchorQueryStringInputToggle = page.locator('[data-mark="property:hideAnchor"] #toggle');
 
     // Media Picker
-    this.pickMultipleItemsSlider = page.locator('[data-mark="property:multiple"] #slider');
-    this.enableFocalPointSlider = page.locator('[data-mark="property:enableLocalFocalPoint"] #slider');
+    this.pickMultipleItemsToggle = page.locator('[data-mark="property:multiple"] #toggle');
+    this.enableFocalPointToggle = page.locator('[data-mark="property:enableLocalFocalPoint"] #toggle');
     this.amountLowValueTxt = page.locator('[data-mark="property:validationLimit"]').getByLabel('Low value');
     this.amountHighValueTxt = page.locator('[data-mark="property:validationLimit"]').getByLabel('High value');
     this.chooseAcceptedTypesBtn = page.locator('[data-mark="property:filter"]').getByLabel('Choose');
@@ -217,7 +217,7 @@ export class DataTypeUiHelper extends UiBaseLocators {
     this.dimensionsWidthTxt = page.locator('[data-mark="property:dimensions"]').getByLabel('Width');
     this.dimensionsHeightTxt = page.locator('[data-mark="property:dimensions"]').getByLabel('Height');
     this.maxImageSizeTxt = page.locator('[data-mark="property:maxImageSize"] #input');
-    this.hideLabelSlider = page.locator('[data-mark="property:hideLabel"] #slider');
+    this.hideLabelToggle = page.locator('[data-mark="property:hideLabel"] #toggle');
     this.inlineRadioBtn = page.locator('[data-mark="property:mode"] uui-radio[value="Inline"]');
     this.addWithPlusBtn = page.locator('[data-mark="property:blocks"] #add-button');
 
@@ -226,15 +226,15 @@ export class DataTypeUiHelper extends UiBaseLocators {
     this.storageTypeDropDownBox = page.locator('#native');
 
     // Content Picker
-    this.showOpenButtonSlider = page.locator('[data-mark="property:showOpenButton"] #slider');
+    this.showOpenButtonToggle = page.locator('[data-mark="property:showOpenButton"] #toggle');
 
     // Dropdown
-    this.enableMultipleChoiceSlider = page.locator('[data-mark="property:multiple"] #slider');
+    this.enableMultipleChoiceToggle = page.locator('[data-mark="property:multiple"] #toggle');
     this.addOptionsBtn = page.locator('[data-mark="property:items"]').getByLabel('Add', {exact: true});
 
     // True/false
-    this.presetValueSlider = page.locator('[data-mark="property:default"] #slider');
-    this.showToggleLabelsSlider = page.locator('[data-mark="property:showLabels"] #slider');
+    this.presetValueToggle = page.locator('[data-mark="property:default"] #toggle');
+    this.showToggleLabelsToggle = page.locator('[data-mark="property:showLabels"] #toggle');
     this.labelOnTxt = page.locator('[data-mark="property:labelOn"] #input');
     this.labelOffTxt = page.locator('[data-mark="property:labelOff"] #input');
 
@@ -242,9 +242,9 @@ export class DataTypeUiHelper extends UiBaseLocators {
     this.addBlockBtn = page.locator('umb-input-block-type #blocks').getByLabel('open');
     this.minAmountTxt = page.getByLabel('Low value');
     this.maxAmountTxt = page.getByLabel('High value');
-    this.singleBlockModeBtn = this.page.locator('umb-property-layout').filter({hasText: 'Single block mode'}).locator('#slider');
-    this.liveEditingModeBtn = this.page.locator('umb-property-layout').filter({hasText: 'Live editing'}).locator('#slider');
-    this.inlineEditingModeBtn = this.page.locator('umb-property-layout').filter({hasText: 'Inline editing'}).locator('#slider');
+    this.singleBlockModeBtn = this.page.locator('umb-property-layout').filter({hasText: 'Single block mode'}).locator('#toggle');
+    this.liveEditingModeBtn = this.page.locator('umb-property-layout').filter({hasText: 'Live editing'}).locator('#toggle');
+    this.inlineEditingModeBtn = this.page.locator('umb-property-layout').filter({hasText: 'Inline editing'}).locator('#toggle');
     this.propertyEditorWidthTxt = this.page.locator('umb-property-layout').filter({hasText: 'Property editor width'}).locator('#input');
     this.labelTextTxt = this.page.locator('[label="Label"]').locator('#input');
     this.overlaySizeOption = this.page.locator('[label="Overlay editor size"]').locator('#native');
@@ -260,8 +260,8 @@ export class DataTypeUiHelper extends UiBaseLocators {
     this.iconColorBtn = this.page.locator('umb-property-layout').filter({hasText: 'Icon color'}).getByLabel('Eye dropper');
     this.iconColorTxt = this.page.locator('[label="Icon color"]').locator('[label="Eye dropper"]').locator('#input');
     this.stylesheetRemoveBtn = this.page.locator('uui-ref-node').getByLabel('Remove', {exact: true});
-    this.hideContentEditorBlockListBtn = this.page.locator('[alias="forceHideContentEditorInOverlay"]').locator('#slider');
-    this.hideContentEditorBlockGridBtn = this.page.locator('[alias="hideContentEditor"]').locator('#slider');
+    this.hideContentEditorBlockListBtn = this.page.locator('[alias="forceHideContentEditorInOverlay"]').locator('#toggle');
+    this.hideContentEditorBlockGridBtn = this.page.locator('[alias="hideContentEditor"]').locator('#toggle');
     this.customStylesheetLabel = this.page.locator('[label="Custom stylesheet"]');
     this.chooseThumbnailAlias = this.page.locator('[alias="thumbnail"]').getByLabel('Choose');
     this.documentTypeWorkspace = this.page.locator('umb-document-type-workspace-editor');
@@ -402,8 +402,8 @@ export class DataTypeUiHelper extends UiBaseLocators {
   }
 
   // Approved Color
-  async clickIncludeLabelsSlider() {
-    await this.includeLabelsSlider.click();
+  async clickIncludeLabelsToggle() {
+    await this.includeLabelsToggle.click();
   }
 
   async removeColorByValue(value: string) {
@@ -423,8 +423,8 @@ export class DataTypeUiHelper extends UiBaseLocators {
   }
 
   // Date Picker
-  async clickOffsetTimeSlider() {
-    await this.offsetTimeSlider.click();
+  async clickOffsetTimeToggle() {
+    await this.offsetTimeToggle.click();
   }
 
   async enterDateFormatValue(value: string) {
@@ -478,16 +478,16 @@ export class DataTypeUiHelper extends UiBaseLocators {
     await this.workspaceViewName.fill(name);
   }
 
-  async clickShowContentWorkspaceViewFirstSlider() {
-    await this.showWorkspaceViewFirstSlider.click();
+  async clickShowContentWorkspaceViewFirstToggle() {
+    await this.showWorkspaceViewFirstToggle.click();
   }
 
-  async clickEditInInfiniteEditorSlider() {
-    await this.editInInfiniteEditorSlider.click();
+  async clickEditInInfiniteEditorToggle() {
+    await this.editInInfiniteEditorToggle.click();
   }
 
-  async clickBulkActionPermissionsSliderByValue(value: string) {
-    await this.page.locator("uui-toggle[label='" + value + "'] #slider").click();
+  async clickBulkActionPermissionsToggleByValue(value: string) {
+    await this.page.locator("uui-toggle[label='" + value + "'] #toggle").click();
   }
 
   async clickSelectIconButton() {
@@ -555,9 +555,9 @@ export class DataTypeUiHelper extends UiBaseLocators {
     await this.stepSizeTxt.fill(value);
   }
 
-  async clickAllowDecimalsSlider() {
-    await expect(this.allowDecimalsSlider).toBeVisible();
-    await this.allowDecimalsSlider.click();
+  async clickAllowDecimalsToggle() {
+    await expect(this.allowDecimalsToggle).toBeVisible();
+    await this.allowDecimalsToggle.click();
   }
 
   // Radiobox
@@ -628,26 +628,26 @@ export class DataTypeUiHelper extends UiBaseLocators {
     await this.maximumNumberOfItemsTxt.fill(value);
   }
 
-  async clickIgnoreUserStartNodesSlider() {
-    await this.ignoreUserStartNodesSlider.click();
+  async clickIgnoreUserStartNodesToggle() {
+    await this.ignoreUserStartNodesToggle.click();
   }
 
   async chooseOverlaySizeByValue(value: string) {
     await this.overlaySizeDropDownBox.selectOption({value: value});
   }
 
-  async clickHideAnchorQueryStringInputSlider() {
-    await this.hideAnchorQueryStringInputSlider.click();
+  async clickHideAnchorQueryStringInputToggle() {
+    await this.hideAnchorQueryStringInputToggle.click();
   }
 
   // Media Picker
-  async clickPickMultipleItemsSlider() {
-    await this.pickMultipleItemsSlider.click();
+  async clickPickMultipleItemsToggle() {
+    await this.pickMultipleItemsToggle.click();
   }
 
-  async clickEnableFocalPointSlider() {
-    await expect(this.enableFocalPointSlider).toBeVisible();
-    await this.enableFocalPointSlider.click();
+  async clickEnableFocalPointToggle() {
+    await expect(this.enableFocalPointToggle).toBeVisible();
+    await this.enableFocalPointToggle.click();
   }
 
   async enterAmountValue(lowValue: string, highValue: string) {
@@ -702,8 +702,8 @@ export class DataTypeUiHelper extends UiBaseLocators {
     await this.maxImageSizeTxt.fill(value);
   }
 
-  async clickHideLabelSlider() {
-    await this.hideLabelSlider.click();
+  async clickHideLabelToggle() {
+    await this.hideLabelToggle.click();
   }
 
   async clickInlineRadioButton() {
@@ -745,9 +745,9 @@ export class DataTypeUiHelper extends UiBaseLocators {
   }
 
   // Content Picker
-  async clickShowOpenButtonSlider() {
-    await expect(this.showOpenButtonSlider).toBeVisible();
-    await this.showOpenButtonSlider.click();
+  async clickShowOpenButtonToggle() {
+    await expect(this.showOpenButtonToggle).toBeVisible();
+    await this.showOpenButtonToggle.click();
   }
 
   async removeContentStartNode(contentName: string) {
@@ -758,9 +758,9 @@ export class DataTypeUiHelper extends UiBaseLocators {
   }
 
   // Dropdown
-  async clickEnableMultipleChoiceSlider() {
-    await expect(this.enableMultipleChoiceSlider).toBeVisible();
-    await this.enableMultipleChoiceSlider.click();
+  async clickEnableMultipleChoiceToggle() {
+    await expect(this.enableMultipleChoiceToggle).toBeVisible();
+    await this.enableMultipleChoiceToggle.click();
   }
 
   async clickAddOptionsButton() {
@@ -769,14 +769,14 @@ export class DataTypeUiHelper extends UiBaseLocators {
   }
 
   // True/false
-  async clickPresetValueSlider() {
-    await expect(this.presetValueSlider).toBeVisible();
-    await this.presetValueSlider.click();
+  async clickPresetValueToggle() {
+    await expect(this.presetValueToggle).toBeVisible();
+    await this.presetValueToggle.click();
   }
 
-  async clickShowToggleLabelsSlider() {
-    await expect(this.showToggleLabelsSlider).toBeVisible();
-    await this.showToggleLabelsSlider.click();
+  async clickShowToggleLabelsToggle() {
+    await expect(this.showToggleLabelsToggle).toBeVisible();
+    await this.showToggleLabelsToggle.click();
   }
 
   async enterLabelOnValue(value: string) {
diff --git a/lib/helpers/DocumentTypeUiHelper.ts b/lib/helpers/DocumentTypeUiHelper.ts
index 7efa147..7a10e0d 100644
--- a/lib/helpers/DocumentTypeUiHelper.ts
+++ b/lib/helpers/DocumentTypeUiHelper.ts
@@ -3,7 +3,7 @@ import {expect, Locator, Page} from "@playwright/test";
 
 export class DocumentTypeUiHelper extends UiBaseLocators {
   private readonly newDocumentTypeBtn: Locator;
-  private readonly varyByCultureSlider: Locator;
+  private readonly varyByCultureToggle: Locator;
   private readonly documentTypeSettingsTabBtn: Locator;
   private readonly documentTypeTemplatesTabBtn: Locator;
   private readonly varyBySegmentsBtn: Locator;
@@ -20,7 +20,7 @@ export class DocumentTypeUiHelper extends UiBaseLocators {
   constructor(page: Page) {
     super(page);
     this.newDocumentTypeBtn = page.getByLabel('New Document Type…');
-    this.varyByCultureSlider = page.locator('label').filter({hasText: 'Vary by culture'}).locator('#slider');
+    this.varyByCultureToggle = page.locator('label').filter({hasText: 'Vary by culture'}).locator('#toggle');
     this.tabGroup = page.locator('[data-mark="workspace:view-links"]');
     this.documentTypeSettingsTabBtn = this.tabGroup.locator('[data-mark*="Settings"]');
     this.documentTypeTemplatesTabBtn = this.tabGroup.locator('[data-mark*="Templates"]');
@@ -52,9 +52,9 @@ export class DocumentTypeUiHelper extends UiBaseLocators {
     await this.newDocumentTypeBtn.click();
   }
 
-  async clickVaryByCultureSlider() {
-    await expect(this.varyByCultureSlider).toBeVisible();
-    await this.varyByCultureSlider.click();
+  async clickVaryByCultureToggle() {
+    await expect(this.varyByCultureToggle).toBeVisible();
+    await this.varyByCultureToggle.click();
   }
 
   async clickDocumentTypeSettingsTab() {
diff --git a/lib/helpers/FormsUiHelper.ts b/lib/helpers/FormsUiHelper.ts
index bdbc31c..a710204 100644
--- a/lib/helpers/FormsUiHelper.ts
+++ b/lib/helpers/FormsUiHelper.ts
@@ -112,7 +112,7 @@ export class FormsUiHelper extends UiBaseLocators{
     this.formEditWorkflowModal = page.locator('form-edit-workflow-modal');
     this.formInputTxt = page.locator('input[type = "text"]');
     this.formInputNumber = page.locator('input[type = "number"]');
-    this.formToggleSlider = page.locator('uui-toggle #slider');
+    this.formToggleSlider = page.locator('uui-toggle #toggle');
     this.prevalueSourceExpandBtn = page.locator('#menu-item button[aria-label="Expand child items for Prevalue Sources"] svg');
     this.prevalueSourceTree = page.locator('umb-tree[alias="Forms.Tree.PrevalueSources"]');
     this.prevalueSourceDeleteBtn = page.locator('uui-button[label="Delete..."]');
@@ -307,7 +307,7 @@ export class FormsUiHelper extends UiBaseLocators{
   }
 
   async toggleFieldSetting(settingAlias: string) {
-    const settingFieldLocator = this.page.locator('umb-property-layout[alias="' + settingAlias + '"] #slider');
+    const settingFieldLocator = this.page.locator('umb-property-layout[alias="' + settingAlias + '"] #toggle');
     await expect(settingFieldLocator).toBeVisible();
     await settingFieldLocator.click();
   }
@@ -323,7 +323,7 @@ export class FormsUiHelper extends UiBaseLocators{
   }
 
   async applyFieldSettingViaSlider(settingAlias: string) {
-    const settingFieldLocator = this.page.locator('umb-property[alias="' + settingAlias + '"] #slider');
+    const settingFieldLocator = this.page.locator('umb-property[alias="' + settingAlias + '"] #toggle');
     await expect(settingFieldLocator).toBeVisible();
     await settingFieldLocator.click();
   }
@@ -331,7 +331,7 @@ export class FormsUiHelper extends UiBaseLocators{
   async applyFieldFileUploadSettings(settingAlias: string, allowedProvidedExtensions: Array<string>, allowedCustomExtensions: Array<string>, allowMultiple: boolean) {
     const settingFieldLocator = this.page.locator('umb-property-layout[alias="' + settingAlias + '"]');
     for (var i = 0; i < allowedProvidedExtensions.length; i++) {
-      const checkBoxLocator = settingFieldLocator.locator('uui-toggle', {hasText: allowedProvidedExtensions[i].toUpperCase()}).locator('#slider');
+      const checkBoxLocator = settingFieldLocator.locator('uui-toggle', {hasText: allowedProvidedExtensions[i].toUpperCase()}).locator('#toggle');
       await expect(checkBoxLocator).toBeVisible();
       await checkBoxLocator.click();
     }
@@ -347,7 +347,7 @@ export class FormsUiHelper extends UiBaseLocators{
   
     if (allowMultiple) {
       const alias = "allowMultipleFileUploads";
-      const multipleUploadLocator = this.page.locator('umb-property-layout[alias="' + alias + '"] #slider');
+      const multipleUploadLocator = this.page.locator('umb-property-layout[alias="' + alias + '"] #toggle');
       await expect(multipleUploadLocator).toBeVisible();
       await multipleUploadLocator.click();
     }
@@ -439,7 +439,7 @@ export class FormsUiHelper extends UiBaseLocators{
   
     for (let i = 0; i < settingValue.length; i++) {
       if (settingValue[i].include) {
-        const includeButtonLocator = settingFieldLocator.locator('div[data-umb-standard-field-mapping-include="' + settingValue[i].alias + '"] #slider');
+        const includeButtonLocator = settingFieldLocator.locator('div[data-umb-standard-field-mapping-include="' + settingValue[i].alias + '"] #toggle');
         await includeButtonLocator.click();
       }
   
@@ -450,7 +450,7 @@ export class FormsUiHelper extends UiBaseLocators{
 
   async setFieldMandatory(message: string) {
     await expect(this.formFieldMandatory).toBeVisible();
-    await this.formFieldMandatory.locator("#slider").click();
+    await this.formFieldMandatory.locator("#toggle").click();
     await this.page.waitForTimeout(1000);
     const inputLocator = this.formFieldMandatory.locator(this.formInputTxt);
     await expect(inputLocator).toBeVisible();
diff --git a/lib/helpers/LanguageUiHelper.ts b/lib/helpers/LanguageUiHelper.ts
index 09279cd..00819f6 100644
--- a/lib/helpers/LanguageUiHelper.ts
+++ b/lib/helpers/LanguageUiHelper.ts
@@ -14,8 +14,8 @@ export class LanguageUiHelper extends UiBaseLocators{
     super(page);
     this.languagesMenu = page.locator('umb-menu').getByLabel('Languages');
     this.languageDropdown = page.locator('umb-input-culture-select #expand-symbol-wrapper');
-    this.defaultLanguageToggle = page.locator('uui-toggle').filter({ hasText: /Default language/ }).locator('#slider');
-    this.mandatoryLanguageToggle = page.locator('uui-toggle').filter({ hasText: /Mandatory language/ }).locator('#slider');
+    this.defaultLanguageToggle = page.locator('uui-toggle').filter({ hasText: /Default language/ }).locator('#toggle');
+    this.mandatoryLanguageToggle = page.locator('uui-toggle').filter({ hasText: /Mandatory language/ }).locator('#toggle');
     this.addFallbackLanguageBtn = page.locator('#add-button');
     this.languageTable = page.locator('umb-language-table-collection-view');
   }
diff --git a/lib/helpers/MemberUiHelper.ts b/lib/helpers/MemberUiHelper.ts
index b1d7c7c..8076d58 100644
--- a/lib/helpers/MemberUiHelper.ts
+++ b/lib/helpers/MemberUiHelper.ts
@@ -13,9 +13,9 @@ export class MemberUiHelper extends UiBaseLocators {
   private readonly emailTxt: Locator;
   private readonly passwordTxt: Locator;
   private readonly confirmNewPasswordTxt: Locator;
-  private readonly approvedSlider: Locator;
-  private readonly lockedOutSlider: Locator;
-  private readonly twoFactorAuthenticationSlider: Locator;
+  private readonly approvedToggle: Locator;
+  private readonly lockedOutToggle: Locator;
+  private readonly twoFactorAuthenticationToggle: Locator;
   private readonly memberInfoItems: Locator;
   private readonly changePasswordBtn: Locator;
   private readonly membersMenu: Locator;
@@ -33,9 +33,9 @@ export class MemberUiHelper extends UiBaseLocators {
     this.emailTxt = page.getByLabel('Email', {exact: true});
     this.passwordTxt = page.getByLabel('Enter your new password', {exact: true});
     this.confirmNewPasswordTxt = page.getByLabel('Confirm new password', {exact: true});
-    this.approvedSlider = page.locator('[label="Approved"] #slider');
-    this.lockedOutSlider = page.locator('[label="Locked out"] #slider');
-    this.twoFactorAuthenticationSlider = page.locator('[label="Two-Factor authentication"] #slider');
+    this.approvedToggle = page.locator('[label="Approved"] #toggle');
+    this.lockedOutToggle = page.locator('[label="Locked out"] #toggle');
+    this.twoFactorAuthenticationToggle = page.locator('[label="Two-Factor authentication"] #toggle');
     this.memberInfoItems = page.locator('umb-stack > div');
     this.changePasswordBtn = page.getByLabel('Change password', {exact: true});
     this.membersMenu = page.locator('umb-menu').getByLabel('Members', {exact: true});
@@ -115,16 +115,16 @@ export class MemberUiHelper extends UiBaseLocators {
     return expect(this.memberInfoItems.filter({hasText: infoName}).locator('span')).toHaveText(value);
   }
 
-  async clickApprovedSlider() {
-    await this.approvedSlider.click();
+  async clickApprovedToggle() {
+    await this.approvedToggle.click();
   }
 
-  async clickLockedOutSlider() {
-    await this.lockedOutSlider.click();
+  async clickLockedOutToggle() {
+    await this.lockedOutToggle.click();
   }
 
-  async clickTwoFactorAuthenticationSlider() {
-    await this.twoFactorAuthenticationSlider.click();
+  async clickTwoFactorAuthenticationToggle() {
+    await this.twoFactorAuthenticationToggle.click();
   }
 
   async clickChangePasswordButton() {
diff --git a/lib/helpers/ProfilingUiHelper.ts b/lib/helpers/ProfilingUiHelper.ts
index 8454a86..a8138be 100644
--- a/lib/helpers/ProfilingUiHelper.ts
+++ b/lib/helpers/ProfilingUiHelper.ts
@@ -3,13 +3,13 @@ import {UiBaseLocators} from "./UiBaseLocators";
 
 export class ProfilingUiHelper extends UiBaseLocators {
   private readonly profilingTab: Locator;
-  private readonly activateProfilerByDefaultSlider: Locator;
+  private readonly activateProfilerByDefaultToggle: Locator;
   private readonly activateProfilerByDefaultCheckbox: Locator;
 
   constructor(page: Page) {
     super(page);
     this.profilingTab = page.getByRole('tab', {name: 'Profiling'});
-    this.activateProfilerByDefaultSlider = page.locator("[label='Activate the profiler by default'] #slider");
+    this.activateProfilerByDefaultToggle = page.locator("[label='Activate the profiler by default'] #toggle");
     this.activateProfilerByDefaultCheckbox = page.getByLabel('Activate the profiler by default');
   }
 
@@ -17,11 +17,11 @@ export class ProfilingUiHelper extends UiBaseLocators {
     await this.profilingTab.click();
   }
 
-  async clickActivateProfilerByDefaultSlider() {
-    await this.activateProfilerByDefaultSlider.click();
+  async clickActivateProfilerByDefaultToggle() {
+    await this.activateProfilerByDefaultToggle.click();
   }
 
-  async isActivateProfilerByDefaultSliderChecked(isChecked: boolean) {
+  async isActivateProfilerByDefaultToggleChecked(isChecked: boolean) {
     return expect(this.activateProfilerByDefaultCheckbox).toBeChecked({checked: isChecked});
   }
 }
diff --git a/lib/helpers/RelationTypeUiHelper.ts b/lib/helpers/RelationTypeUiHelper.ts
index a47ae49..7b26daf 100644
--- a/lib/helpers/RelationTypeUiHelper.ts
+++ b/lib/helpers/RelationTypeUiHelper.ts
@@ -5,7 +5,7 @@ export class RelationTypeUiHelper extends UiBaseLocators{
   private readonly relationTypeNameTxt: Locator;
   private readonly parentToChildRadioBtn: Locator;
   private readonly bidirectionalRadioBtn: Locator;
-  private readonly isDependencySlider: Locator;
+  private readonly isDependencyToggle: Locator;
   private readonly parentDropDownBox: Locator;
   private readonly childDropDownBox: Locator;
 
@@ -14,7 +14,7 @@ export class RelationTypeUiHelper extends UiBaseLocators{
     this.relationTypeNameTxt = page.locator('#name #input');
     this.parentToChildRadioBtn = page.locator("uui-radio[label='Parent to child'] #button");
     this.bidirectionalRadioBtn = page.locator("uui-radio[label='Bidirectional'] #button");
-    this.isDependencySlider = page.locator("umb-property-layout[label='Is dependency'] #slider");
+    this.isDependencyToggle = page.locator("umb-property-layout[label='Is dependency'] #toggle");
     this.parentDropDownBox = page.locator("umb-property-layout[label='Parent'] #native");
     this.childDropDownBox = page.locator("umb-property-layout[label='Child'] #native");
   }
@@ -49,8 +49,8 @@ export class RelationTypeUiHelper extends UiBaseLocators{
     await this.bidirectionalRadioBtn.click();
   }
 
-  async clickIsDependencySlider() {
-    await this.isDependencySlider.click();
+  async clickIsDependencyToggle() {
+    await this.isDependencyToggle.click();
   }
 
   async selectParentOption(option: string) {
diff --git a/lib/helpers/TelemetryDataUiHelper.ts b/lib/helpers/TelemetryDataUiHelper.ts
index b6c510f..1a47b17 100644
--- a/lib/helpers/TelemetryDataUiHelper.ts
+++ b/lib/helpers/TelemetryDataUiHelper.ts
@@ -3,12 +3,12 @@ import {UiBaseLocators} from "./UiBaseLocators";
 
 export class TelemetryDataUiHelper extends UiBaseLocators {
   private readonly telemetryDataTab: Locator;
-  private readonly telemetryDataLevelSlider: Locator;
+  private readonly telemetryDataLevelToggle: Locator;
 
   constructor(page: Page) {
     super(page);
     this.telemetryDataTab = page.getByRole('tab', {name: 'Telemetry Data'});
-    this.telemetryDataLevelSlider = page.locator('[name="telemetryLevel"] >> input[id=input]');
+    this.telemetryDataLevelToggle = page.locator('[name="telemetryLevel"] >> input[id=input]');
   }
 
   async clickTelemetryDataTab() {
@@ -16,10 +16,10 @@ export class TelemetryDataUiHelper extends UiBaseLocators {
   }
 
   async changeTelemetryDataLevelValue(value: string) {
-    await this.telemetryDataLevelSlider.fill(value);
+    await this.telemetryDataLevelToggle.fill(value);
   }
 
   async doesTelemetryDataLevelHaveValue(value: string) {
-    return await expect(this.telemetryDataLevelSlider).toHaveValue(value);
+    return await expect(this.telemetryDataLevelToggle).toHaveValue(value);
   }
 }
diff --git a/lib/helpers/UiBaseLocators.ts b/lib/helpers/UiBaseLocators.ts
index 9b53de7..49ff6a8 100644
--- a/lib/helpers/UiBaseLocators.ts
+++ b/lib/helpers/UiBaseLocators.ts
@@ -48,7 +48,7 @@ export class UiBaseLocators {
   public readonly addTabBtn: Locator;
   public readonly descriptionBtn: Locator;
   public readonly enterDescriptionTxt: Locator;
-  public readonly mandatorySlider: Locator;
+  public readonly mandatoryToggle: Locator;
   public readonly validation: Locator;
   public readonly regexTxt: Locator;
   public readonly regexMessageTxt: Locator;
@@ -194,7 +194,7 @@ export class UiBaseLocators {
     this.addTabBtn = page.getByLabel('Add tab');
     this.descriptionBtn = page.getByLabel('Description');
     this.enterDescriptionTxt = page.getByLabel('Enter a description...');
-    this.mandatorySlider = page.locator('#mandatory #slider');
+    this.mandatoryToggle = page.locator('#mandatory #toggle');
     this.validation = page.locator('#native');
     this.regexTxt = page.locator('input[name="pattern"]');
     this.regexMessageTxt = page.locator('textarea[name="pattern-message"]');
@@ -697,8 +697,8 @@ export class UiBaseLocators {
     await this.labelAboveBtn.click();
   }
 
-  async clickMandatorySlider() {
-    await this.mandatorySlider.click();
+  async clickMandatoryToggle() {
+    await this.mandatoryToggle.click();
   }
 
   async selectValidationOption(option: string) {
diff --git a/lib/helpers/UserUiHelper.ts b/lib/helpers/UserUiHelper.ts
index ea50c16..eba91ba 100644
--- a/lib/helpers/UserUiHelper.ts
+++ b/lib/helpers/UserUiHelper.ts
@@ -19,8 +19,8 @@ export class UserUiHelper extends UiBaseLocators {
   private readonly statusBtn: Locator;
   private readonly groupBtn: Locator;
   private readonly chooseUserGroupsBtn: Locator;
-  private readonly allowAccessToAllDocumentsBtn: Locator;
-  private readonly allowAccessToAllMediaBtn: Locator;
+  private readonly allowAccessToAllDocumentsToggle: Locator;
+  private readonly allowAccessToAllMediaToggle: Locator;
   private readonly mediaInput: Locator;
   private readonly chooseContainerBtn: Locator;
   private readonly languageBtn: Locator;
@@ -54,8 +54,8 @@ export class UserUiHelper extends UiBaseLocators {
     this.userSectionCard = page.locator('uui-card-user');
     this.statusBtn = page.locator('uui-button', {hasText: 'Status'});
     this.groupBtn = page.locator('uui-button', {hasText: 'Groups'});
-    this.allowAccessToAllDocumentsBtn = page.locator('umb-property-layout').filter({hasText: 'Allow access to all documents'}).locator('#slider');
-    this.allowAccessToAllMediaBtn = page.locator('umb-property-layout').filter({hasText: 'Allow access to all media'}).locator('#slider');
+    this.allowAccessToAllDocumentsToggle = page.locator('umb-property-layout').filter({hasText: 'Allow access to all documents'}).locator('#toggle');
+    this.allowAccessToAllMediaToggle = page.locator('umb-property-layout').filter({hasText: 'Allow access to all media'}).locator('#toggle');
     this.mediaInput = page.locator('umb-input-media');
     this.chooseContainerBtn = page.locator('#container').getByLabel('Choose');
     this.languageBtn = page.locator('[label="UI Culture"] select');
@@ -191,12 +191,12 @@ export class UserUiHelper extends UiBaseLocators {
     await this.mediaInput.locator('[name="' + name + '"]').locator('[label="Remove"]').click();
   }
 
-  async clickAllowAccessToAllDocumentsSlider() {
-    await this.allowAccessToAllDocumentsBtn.click();
+  async clickAllowAccessToAllDocumentsToggle() {
+    await this.allowAccessToAllDocumentsToggle.click();
   }
 
-  async clickAllowAccessToAllMediaSlider() {
-    await this.allowAccessToAllMediaBtn.click();
+  async clickAllowAccessToAllMediaToggle() {
+    await this.allowAccessToAllMediaToggle.click();
   }
 
   async isUserDisabledTextVisible() {