diff --git a/src/components/Button/Button.jsx b/src/components/Button/Button.jsx
index f5035b51..34b03762 100644
--- a/src/components/Button/Button.jsx
+++ b/src/components/Button/Button.jsx
@@ -81,7 +81,7 @@ Button.propTypes = {
   /* Buttons can be either default or small, which affects their styling */
   size: PropTypes.oneOf(["small"]),
   /* Buttons can be either default or secondary, which affects their styling */
-  role: PropTypes.oneOf(["secondary"]),
+  modifier: PropTypes.oneOf(["secondary"]),
   innerRef: PropTypes.any,
   /** A unique identifier for the button */
   id: PropTypes.string,
diff --git a/src/components/PageContent/Badge/Badge.jsx b/src/components/PageContent/Badge/Badge.jsx
index dac08a1c..7af7b84d 100644
--- a/src/components/PageContent/Badge/Badge.jsx
+++ b/src/components/PageContent/Badge/Badge.jsx
@@ -9,17 +9,17 @@ import * as Rivet from "../../util/Rivet";
 
 const badgeClass = "rvt-badge";
 
-const computeStyle = (variant, role) => {
+const computeStyle = (variant, modifier) => {
   if (!variant || variant === "plain") {
-    if (role) {
-      return `${badgeClass}--${role}`;
+    if (modifier) {
+      return `${badgeClass}--${modifier}`;
     } else {
       return null;
     }
   } else {
     let variantClass = `${badgeClass}--${variant}`;
-    if (role) {
-      variantClass += `-${role}`;
+    if (modifier) {
+      variantClass += `-${modifier}`;
     }
 
     return variantClass;
@@ -30,13 +30,17 @@ const Badge = ({
   children,
   className,
   id = Rivet.shortuid(),
-  role,
+  type: modifier,
   variant,
   ...attrs
 }) => (
   <span
     id={id}
-    className={classNames(badgeClass, computeStyle(variant, role), className)}
+    className={classNames(
+      badgeClass,
+      computeStyle(variant, modifier),
+      className
+    )}
     {...attrs}
   >
     {children}
@@ -48,7 +52,7 @@ Badge.propTypes = {
   /* The variant determines the style of the badge */
   variant: PropTypes.oneOf(["danger", "info", "plain", "success", "warning"]),
   /* Badges can be either default or secondary, which affects their styling */
-  role: PropTypes.oneOf(["secondary"]),
+  modifier: PropTypes.oneOf(["secondary"]),
   /** A unique identifier for the badge */
   id: PropTypes.string,
 };
diff --git a/src/components/PageContent/Badge/Badge.test.jsx b/src/components/PageContent/Badge/Badge.test.jsx
index 7b5def05..a08a0cb6 100644
--- a/src/components/PageContent/Badge/Badge.test.jsx
+++ b/src/components/PageContent/Badge/Badge.test.jsx
@@ -29,7 +29,7 @@ describe("<Badge />", () => {
 
     it("should render the appropriate role", () => {
       render(
-        <Badge role="secondary" data-testid={badgeTestId}>
+        <Badge type="secondary" data-testid={badgeTestId}>
           Secondary
         </Badge>
       );
@@ -40,7 +40,7 @@ describe("<Badge />", () => {
 
     it("should render combinations of variant and role", () => {
       render(
-        <Badge variant="success" role="secondary" data-testid={badgeTestId}>
+        <Badge variant="success" type="secondary" data-testid={badgeTestId}>
           Success secondary
         </Badge>
       );