diff --git a/src/components/Filter/FilterAutocompleteField.tsx b/src/components/Filter/FilterAutocompleteField.tsx
index 33a6bb57f..914ca1264 100644
--- a/src/components/Filter/FilterAutocompleteField.tsx
+++ b/src/components/Filter/FilterAutocompleteField.tsx
@@ -93,7 +93,7 @@ const FilterAutocompleteField: React.FC<FilterAutocompleteFieldProps> = ({
   return (
     <div {...rest}>
       <TextField
-        data-test="filter-field-autocomplete-input"
+        data-test="filterFieldAutocompleteInput"
         className={classes.inputContainer}
         fullWidth
         name={filterField.name + "_autocomplete"}
@@ -109,7 +109,7 @@ const FilterAutocompleteField: React.FC<FilterAutocompleteFieldProps> = ({
           <FormControlLabel
             control={
               <Checkbox
-                data-test="filter-field-autocomplete-selected"
+                data-test="filterFieldAutocompleteSelected"
                 data-test-id={filterField.value}
                 checked={filterField.value.includes(displayValue.value)}
               />
@@ -123,7 +123,7 @@ const FilterAutocompleteField: React.FC<FilterAutocompleteFieldProps> = ({
       {displayHr && <Hr className={classes.hr} />}
       {displayNoResults && (
         <Typography
-          data-test="filter-field-autocomplete-no-results"
+          data-test="filterFieldAutocompleteNoResults"
           className={classes.noResults}
           color="textSecondary"
         >
@@ -135,7 +135,7 @@ const FilterAutocompleteField: React.FC<FilterAutocompleteFieldProps> = ({
           <FormControlLabel
             control={
               <Checkbox
-                data-test="filter-field-autocomplete-option"
+                data-test="filterFieldAutocompleteOption"
                 data-test-id={filterField.value}
                 checked={filterField.value.includes(option.value)}
               />
@@ -148,7 +148,7 @@ const FilterAutocompleteField: React.FC<FilterAutocompleteFieldProps> = ({
       ))}
       {filterField.hasMore && (
         <Link
-          data-test="filter-field-autocomplete-has-more"
+          data-test="filterFieldAutocompleteHasMore"
           className={classes.showMore}
           underline
           onClick={filterField.onFetchMore}
diff --git a/src/components/Filter/FilterContent.tsx b/src/components/Filter/FilterContent.tsx
index 4f6acb443..4807800e0 100644
--- a/src/components/Filter/FilterContent.tsx
+++ b/src/components/Filter/FilterContent.tsx
@@ -164,7 +164,7 @@ const FilterContent: React.FC<FilterContentProps> = ({
                 <FormControlLabel
                   control={
                     <Checkbox
-                      data-test="filter-group-active"
+                      data-test="filterGroupActive"
                       data-test-id={filterField.name}
                       checked={filterField.active}
                     />
@@ -215,7 +215,7 @@ const FilterContent: React.FC<FilterContentProps> = ({
                   ) && (
                     <>
                       <SingleSelectField
-                        data-test="filter-field-range-type-choice"
+                        data-test="filterFieldRangeTypeChoice"
                         choices={getIsFilterMultipleChoices(intl)}
                         value={
                           filterField.multiple
@@ -385,7 +385,7 @@ const FilterContent: React.FC<FilterContentProps> = ({
                         <FormControlLabel
                           control={
                             <Radio
-                              data-test="filter-field-boolean"
+                              data-test="filterFieldBoolean"
                               data-test-is-checked={
                                 filterField.value[0] === option.value
                               }
diff --git a/src/components/Filter/FilterOptionField.tsx b/src/components/Filter/FilterOptionField.tsx
index 3d211e087..7e208a631 100644
--- a/src/components/Filter/FilterOptionField.tsx
+++ b/src/components/Filter/FilterOptionField.tsx
@@ -54,13 +54,13 @@ const FilterOptionField: React.FC<FilterBaseFieldProps> = ({
             control={
               filterField.multiple ? (
                 <Checkbox
-                  data-test="filter-option"
+                  data-test="filterOption"
                   data-test-id={option.value}
                   checked={filterField.value.includes(option.value)}
                 />
               ) : (
                 <Radio
-                  data-test="filter-option"
+                  data-test="filterOption"
                   data-test-id={option.value}
                   checked={filterField.value[0] === option.value}
                   color="primary"
diff --git a/src/components/SingleSelectField/SingleSelectField.tsx b/src/components/SingleSelectField/SingleSelectField.tsx
index 3fa7b9567..6009b4c76 100644
--- a/src/components/SingleSelectField/SingleSelectField.tsx
+++ b/src/components/SingleSelectField/SingleSelectField.tsx
@@ -100,7 +100,7 @@ export const SingleSelectField: React.FC<SingleSelectFieldProps> = props => {
         {choices.length > 0 ? (
           choices.map(choice => (
             <MenuItem
-              data-test="select-field-option"
+              data-test="selectFieldOption"
               data-test-id={choice.value}
               value={choice.value}
               key={choice.value}
@@ -110,7 +110,7 @@ export const SingleSelectField: React.FC<SingleSelectFieldProps> = props => {
           ))
         ) : (
           <MenuItem
-            data-test="select-field-option"
+            data-test="selectFieldOption"
             data-test-disabled
             disabled={true}
           >
diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap
index cc044fd1a..48a662c9f 100644
--- a/src/storybook/__snapshots__/Stories.test.ts.snap
+++ b/src/storybook/__snapshots__/Stories.test.ts.snap
@@ -2012,7 +2012,7 @@ exports[`Storyshots Generics / Filter default 1`] = `
             <span
               aria-disabled="false"
               class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-checked-id MuiCheckbox-checked-id MuiIconButton-colorPrimary-id"
-              data-test="filter-group-active"
+              data-test="filterGroupActive"
               data-test-id="createdAt"
             >
               <span
@@ -2210,7 +2210,7 @@ exports[`Storyshots Generics / Filter default 1`] = `
             <span
               aria-disabled="false"
               class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id MuiIconButton-colorPrimary-id"
-              data-test="filter-group-active"
+              data-test="filterGroupActive"
               data-test-id="multiplOptions"
             >
               <span
@@ -2255,7 +2255,7 @@ exports[`Storyshots Generics / Filter default 1`] = `
             <span
               aria-disabled="false"
               class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id MuiIconButton-colorPrimary-id"
-              data-test="filter-group-active"
+              data-test="filterGroupActive"
               data-test-id="price"
             >
               <span
@@ -2300,7 +2300,7 @@ exports[`Storyshots Generics / Filter default 1`] = `
             <span
               aria-disabled="false"
               class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-checked-id MuiCheckbox-checked-id MuiIconButton-colorPrimary-id"
-              data-test="filter-group-active"
+              data-test="filterGroupActive"
               data-test-id="status"
             >
               <span
@@ -2359,7 +2359,7 @@ exports[`Storyshots Generics / Filter default 1`] = `
                 <span
                   aria-disabled="false"
                   class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id PrivateSwitchBase-checked-id MuiRadio-checked-id MuiIconButton-colorPrimary-id"
-                  data-test="filter-option"
+                  data-test="filterOption"
                   data-test-id="val1"
                 >
                   <span
@@ -2415,7 +2415,7 @@ exports[`Storyshots Generics / Filter default 1`] = `
                 <span
                   aria-disabled="false"
                   class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiIconButton-colorPrimary-id"
-                  data-test="filter-option"
+                  data-test="filterOption"
                   data-test-id="val2"
                 >
                   <span
@@ -2470,7 +2470,7 @@ exports[`Storyshots Generics / Filter default 1`] = `
                 <span
                   aria-disabled="false"
                   class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiIconButton-colorPrimary-id"
-                  data-test="filter-option"
+                  data-test="filterOption"
                   data-test-id="val3"
                 >
                   <span
@@ -2582,7 +2582,7 @@ exports[`Storyshots Generics / Filter interactive 1`] = `
             <span
               aria-disabled="false"
               class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-checked-id MuiCheckbox-checked-id MuiIconButton-colorPrimary-id"
-              data-test="filter-group-active"
+              data-test="filterGroupActive"
               data-test-id="createdAt"
             >
               <span
@@ -2780,7 +2780,7 @@ exports[`Storyshots Generics / Filter interactive 1`] = `
             <span
               aria-disabled="false"
               class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id MuiIconButton-colorPrimary-id"
-              data-test="filter-group-active"
+              data-test="filterGroupActive"
               data-test-id="multiplOptions"
             >
               <span
@@ -2825,7 +2825,7 @@ exports[`Storyshots Generics / Filter interactive 1`] = `
             <span
               aria-disabled="false"
               class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id MuiIconButton-colorPrimary-id"
-              data-test="filter-group-active"
+              data-test="filterGroupActive"
               data-test-id="price"
             >
               <span
@@ -2870,7 +2870,7 @@ exports[`Storyshots Generics / Filter interactive 1`] = `
             <span
               aria-disabled="false"
               class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-checked-id MuiCheckbox-checked-id MuiIconButton-colorPrimary-id"
-              data-test="filter-group-active"
+              data-test="filterGroupActive"
               data-test-id="status"
             >
               <span
@@ -2929,7 +2929,7 @@ exports[`Storyshots Generics / Filter interactive 1`] = `
                 <span
                   aria-disabled="false"
                   class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id PrivateSwitchBase-checked-id MuiRadio-checked-id MuiIconButton-colorPrimary-id"
-                  data-test="filter-option"
+                  data-test="filterOption"
                   data-test-id="val1"
                 >
                   <span
@@ -2985,7 +2985,7 @@ exports[`Storyshots Generics / Filter interactive 1`] = `
                 <span
                   aria-disabled="false"
                   class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiIconButton-colorPrimary-id"
-                  data-test="filter-option"
+                  data-test="filterOption"
                   data-test-id="val2"
                 >
                   <span
@@ -3040,7 +3040,7 @@ exports[`Storyshots Generics / Filter interactive 1`] = `
                 <span
                   aria-disabled="false"
                   class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiIconButton-colorPrimary-id"
-                  data-test="filter-option"
+                  data-test="filterOption"
                   data-test-id="val3"
                 >
                   <span