diff --git a/.stylelintrc b/.stylelintrc
index 93af80b7de..47dd3e5d9b 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -3,14 +3,16 @@
     "stylelint-config-twbs-bootstrap/scss"
   ],
   "rules": {
-    "property-blacklist": [
+    "function-disallowed-list": [
+      "calc"
+    ],
+    "property-disallowed-list": [
       "border-radius",
       "border-top-left-radius",
       "border-top-right-radius",
       "border-bottom-right-radius",
       "border-bottom-left-radius",
       "transition"
-    ],
-    "function-blacklist": ["calc"]
+    ]
   }
 }
diff --git a/scss/_card.scss b/scss/_card.scss
index 7c35f7ed8f..faaa75ef7f 100644
--- a/scss/_card.scss
+++ b/scss/_card.scss
@@ -206,12 +206,12 @@
 
           .card-img-top,
           .card-header {
-            // stylelint-disable-next-line property-blacklist
+            // stylelint-disable-next-line property-disallowed-list
             border-top-right-radius: 0;
           }
           .card-img-bottom,
           .card-footer {
-            // stylelint-disable-next-line property-blacklist
+            // stylelint-disable-next-line property-disallowed-list
             border-bottom-right-radius: 0;
           }
         }
@@ -221,12 +221,12 @@
 
           .card-img-top,
           .card-header {
-            // stylelint-disable-next-line property-blacklist
+            // stylelint-disable-next-line property-disallowed-list
             border-top-left-radius: 0;
           }
           .card-img-bottom,
           .card-footer {
-            // stylelint-disable-next-line property-blacklist
+            // stylelint-disable-next-line property-disallowed-list
             border-bottom-left-radius: 0;
           }
         }
diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss
index fa6603d978..2d1228efe5 100644
--- a/scss/_custom-forms.scss
+++ b/scss/_custom-forms.scss
@@ -150,7 +150,7 @@
 
 .custom-radio {
   .custom-control-label::before {
-    // stylelint-disable-next-line property-blacklist
+    // stylelint-disable-next-line property-disallowed-list
     border-radius: $custom-radio-indicator-border-radius;
   }
 
@@ -180,7 +180,7 @@
       left: -($custom-switch-width + $custom-control-gutter);
       width: $custom-switch-width;
       pointer-events: all;
-      // stylelint-disable-next-line property-blacklist
+      // stylelint-disable-next-line property-disallowed-list
       border-radius: $custom-switch-indicator-border-radius;
     }
 
@@ -190,7 +190,7 @@
       width: $custom-switch-indicator-size;
       height: $custom-switch-indicator-size;
       background-color: $custom-control-indicator-border-color;
-      // stylelint-disable-next-line property-blacklist
+      // stylelint-disable-next-line property-disallowed-list
       border-radius: $custom-switch-indicator-border-radius;
       @include transition(transform .15s ease-in-out, $custom-forms-transition);
     }
diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index 4444ff0f07..505df6fdf2 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -299,7 +299,7 @@ label {
 //
 // Details at https://github.com/twbs/bootstrap/issues/24093
 button {
-  // stylelint-disable-next-line property-blacklist
+  // stylelint-disable-next-line property-disallowed-list
   border-radius: 0;
 }
 
diff --git a/scss/_spinners.scss b/scss/_spinners.scss
index 27c9241a79..146c820675 100644
--- a/scss/_spinners.scss
+++ b/scss/_spinners.scss
@@ -13,7 +13,7 @@
   vertical-align: text-bottom;
   border: $spinner-border-width solid currentColor;
   border-right-color: transparent;
-  // stylelint-disable-next-line property-blacklist
+  // stylelint-disable-next-line property-disallowed-list
   border-radius: 50%;
   animation: spinner-border .75s linear infinite;
 }
@@ -44,7 +44,7 @@
   height: $spinner-height;
   vertical-align: text-bottom;
   background-color: currentColor;
-  // stylelint-disable-next-line property-blacklist
+  // stylelint-disable-next-line property-disallowed-list
   border-radius: 50%;
   opacity: 0;
   animation: spinner-grow .75s linear infinite;
diff --git a/scss/mixins/_border-radius.scss b/scss/mixins/_border-radius.scss
index aee9bf3d3e..4fad91d676 100644
--- a/scss/mixins/_border-radius.scss
+++ b/scss/mixins/_border-radius.scss
@@ -1,4 +1,4 @@
-// stylelint-disable property-blacklist
+// stylelint-disable property-disallowed-list
 // Single side border-radius
 
 // Helper function to replace negative values with 0
diff --git a/scss/mixins/_transition.scss b/scss/mixins/_transition.scss
index 54553deb9c..54870bf6a8 100644
--- a/scss/mixins/_transition.scss
+++ b/scss/mixins/_transition.scss
@@ -1,4 +1,4 @@
-// stylelint-disable property-blacklist
+// stylelint-disable property-disallowed-list
 @mixin transition($transition...) {
   @if length($transition) == 0 {
     $transition: $transition-base;
diff --git a/scss/utilities/_borders.scss b/scss/utilities/_borders.scss
index 302f6bf849..205f3fc24e 100644
--- a/scss/utilities/_borders.scss
+++ b/scss/utilities/_borders.scss
@@ -1,4 +1,4 @@
-// stylelint-disable property-blacklist, declaration-no-important
+// stylelint-disable property-disallowed-list, declaration-no-important
 
 //
 // Border