diff --git a/src/components/Hits/__tests__/__snapshots__/Hits-test.js.snap b/src/components/Hits/__tests__/__snapshots__/Hits-test.js.snap
index fa537bf2db..27bc4fb9f1 100644
--- a/src/components/Hits/__tests__/__snapshots__/Hits-test.js.snap
+++ b/src/components/Hits/__tests__/__snapshots__/Hits-test.js.snap
@@ -38,7 +38,7 @@ exports[`Hits markup should render <Hits /> without highlight function 1`] = `
       className="item"
       dangerouslySetInnerHTML={
         Object {
-          "__html": "<mark class=\\"ais-HighLight-highlighted\\">name 1</mark>",
+          "__html": "<mark class=\\"ais-Highlight-highlighted\\">name 1</mark>",
         }
       }
     />
@@ -46,7 +46,7 @@ exports[`Hits markup should render <Hits /> without highlight function 1`] = `
       className="item"
       dangerouslySetInnerHTML={
         Object {
-          "__html": "<mark class=\\"ais-HighLight-highlighted\\">name 2</mark>",
+          "__html": "<mark class=\\"ais-Highlight-highlighted\\">name 2</mark>",
         }
       }
     />
diff --git a/src/helpers/__tests__/highlight-test.js b/src/helpers/__tests__/highlight-test.js
index 26162c8684..e472994ac6 100644
--- a/src/helpers/__tests__/highlight-test.js
+++ b/src/helpers/__tests__/highlight-test.js
@@ -74,7 +74,7 @@ describe('highlight', () => {
         hit,
       })
     ).toMatchInlineSnapshot(
-      `"<mark class=\\"ais-HighLight-highlighted\\">Amazon</mark> - Fire TV Stick with Alexa Voice Remote - Black"`
+      `"<mark class=\\"ais-Highlight-highlighted\\">Amazon</mark> - Fire TV Stick with Alexa Voice Remote - Black"`
     );
   });
 
@@ -86,7 +86,7 @@ describe('highlight', () => {
         hit,
       })
     ).toMatchInlineSnapshot(
-      `"Enjoy smart access to videos, games and apps with this <em class=\\"ais-HighLight-highlighted\\">Amazon</em> Fire TV stick. Its Alexa voice remote lets you deliver hands-free commands when you want to watch television or engage with other applications. With a quad-core processor, 1GB internal memory and 8GB of storage, this portable <em class=\\"ais-HighLight-highlighted\\">Amazon</em> Fire TV stick works fast for buffer-free streaming."`
+      `"Enjoy smart access to videos, games and apps with this <em class=\\"ais-Highlight-highlighted\\">Amazon</em> Fire TV stick. Its Alexa voice remote lets you deliver hands-free commands when you want to watch television or engage with other applications. With a quad-core processor, 1GB internal memory and 8GB of storage, this portable <em class=\\"ais-Highlight-highlighted\\">Amazon</em> Fire TV stick works fast for buffer-free streaming."`
     );
   });
 
@@ -106,7 +106,7 @@ describe('highlight', () => {
         hit,
       })
     ).toMatchInlineSnapshot(
-      `"Nested <mark class=\\"ais-HighLight-highlighted\\">Amazon</mark> name"`
+      `"Nested <mark class=\\"ais-Highlight-highlighted\\">Amazon</mark> name"`
     );
   });
 });
diff --git a/src/helpers/highlight.js b/src/helpers/highlight.js
index aa3512db18..7ef955be34 100644
--- a/src/helpers/highlight.js
+++ b/src/helpers/highlight.js
@@ -1,7 +1,7 @@
 import { getPropertyByPath } from '../lib/utils';
 import { component } from '../lib/suit';
 
-const suit = component('HighLight');
+const suit = component('Highlight');
 
 export default function highlight({
   attribute,
diff --git a/storybook/app/builtin/stories/hits.stories.js b/storybook/app/builtin/stories/hits.stories.js
index d5b3a0fb99..9056afaa0d 100644
--- a/storybook/app/builtin/stories/hits.stories.js
+++ b/storybook/app/builtin/stories/hits.stories.js
@@ -56,7 +56,7 @@ export default () => {
             container,
             templates: {
               item:
-                '{{#helpers.highlight}}{ "attribute": "name", "highlightedTagName": "mark" }{{/helpers.highlight}}',
+                '{{#helpers.highlight}}{ "attribute": "name" }{{/helpers.highlight}}',
             },
           })
         );