diff --git a/.sass-lint.yml b/.sass-lint.yml
index ab5645d2f..3df28c794 100644
--- a/.sass-lint.yml
+++ b/.sass-lint.yml
@@ -4,8 +4,8 @@ options:
 files:
   include: 'system-addon/content-src/**/*.scss'
 
-
 rules:
+  class-name-format: [{convention: ["hyphenatedlowercase", "camelcase"]}]
   extends-before-declarations: 2
   extends-before-mixins: 2
   force-element-nesting: 0
@@ -23,4 +23,3 @@ rules:
   no-warn: 1
   placeholder-in-extend: 2
   property-sort-order: 0
-
diff --git a/system-addon/content-src/components/Search/_Search.scss b/system-addon/content-src/components/Search/_Search.scss
index 5f5030c84..76336a086 100644
--- a/system-addon/content-src/components/Search/_Search.scss
+++ b/system-addon/content-src/components/Search/_Search.scss
@@ -71,7 +71,6 @@
 
 @at-root {
   // Adjust the style of the contentSearchUI-generated table
-  // sass-lint:disable-block class-name-format
   .contentSearchSuggestionTable {
     background-color: var(--newtab-search-dropdown-color);
     border: 0;
diff --git a/system-addon/content-src/styles/_icons.scss b/system-addon/content-src/styles/_icons.scss
index fcf569e33..de62272a6 100644
--- a/system-addon/content-src/styles/_icons.scss
+++ b/system-addon/content-src/styles/_icons.scss
@@ -89,7 +89,7 @@
     background-image: url('#{$image-path}glyph-pocket-16.svg');
   }
 
-  &.icon-historyItem { // sass-lint:disable-line class-name-format
+  &.icon-historyItem {
     background-image: url('#{$image-path}glyph-historyItem-16.svg');
   }