diff --git a/src/components/Badge/Badge.jsx b/src/components/Badge/Badge.jsx
index 2c8424c10..9936b3424 100644
--- a/src/components/Badge/Badge.jsx
+++ b/src/components/Badge/Badge.jsx
@@ -7,14 +7,15 @@ const cx = lucidClassNames.bind('&-Badge');
 
 const { node, string, oneOf } = PropTypes;
 
+const KIND_DEFAULT = 'default';
 const KIND_PRIMARY = 'primary';
 const KIND_SUCCESS = 'success';
 const KIND_DANGER = 'danger';
 const KIND_WARNING = 'warning';
 const KIND_INFO = 'info';
 const KIND_DARK = 'dark';
-const KIND_DEFAULT = 'default';
 const KINDS = [
+	KIND_DEFAULT,
 	KIND_PRIMARY,
 	KIND_SUCCESS,
 	KIND_DANGER,
diff --git a/src/components/SplitButton/__snapshots__/SplitButton.spec.jsx.snap b/src/components/SplitButton/__snapshots__/SplitButton.spec.jsx.snap
index bfcfefa7a..76287934f 100644
--- a/src/components/SplitButton/__snapshots__/SplitButton.spec.jsx.snap
+++ b/src/components/SplitButton/__snapshots__/SplitButton.spec.jsx.snap
@@ -329,7 +329,7 @@ exports[`SplitButton [common] example testing should match snapshot(s) for 04.up
         hasOnlyIcon={false}
         isActive={false}
         isDisabled={false}
-        kind="success"
+        kind="primary"
         onClick={[Function]}
         type="button"
       >
@@ -340,7 +340,7 @@ exports[`SplitButton [common] example testing should match snapshot(s) for 04.up
         hasOnlyIcon={true}
         isActive={false}
         isDisabled={false}
-        kind="success"
+        kind="primary"
         onClick={[Function]}
         type="button"
       >
diff --git a/src/components/SplitButton/examples/04.up.jsx b/src/components/SplitButton/examples/04.up.jsx
index 559daf4de..c348d30ea 100644
--- a/src/components/SplitButton/examples/04.up.jsx
+++ b/src/components/SplitButton/examples/04.up.jsx
@@ -5,8 +5,8 @@ import { SplitButton } from '../../../index';
 export default createClass({
 	render() {
 		return (
-			<SplitButton direction="up" kind="success" style={{ height: 100 }}>
-				<SplitButton.Button kind="success">Save</SplitButton.Button>
+			<SplitButton direction="up" kind="primary" style={{ height: 100 }}>
+				<SplitButton.Button kind="primary">Save</SplitButton.Button>
 				<SplitButton.Button>Action 01</SplitButton.Button>
 				<SplitButton.Button>Here's Another Action</SplitButton.Button>
 				<SplitButton.Button>And Another Action</SplitButton.Button>
diff --git a/src/components/Tabs/__snapshots__/Tabs.spec.jsx.snap b/src/components/Tabs/__snapshots__/Tabs.spec.jsx.snap
index 52ec244df..47d11a4b5 100644
--- a/src/components/Tabs/__snapshots__/Tabs.spec.jsx.snap
+++ b/src/components/Tabs/__snapshots__/Tabs.spec.jsx.snap
@@ -804,6 +804,94 @@ exports[`Tabs [common] example testing should match snapshot(s) for 09-with-coun
 </div>
 `;
 
+exports[`Tabs [common] example testing should match snapshot(s) for 09-with-count 2`] = `
+<div
+  className="lucid-Tabs"
+>
+  <ul
+    className="lucid-Tabs-bar lucid-Tabs-variable-width"
+  >
+    <Tabs.Tab
+      Title="One"
+      count={1231321}
+      index={0}
+      isLastTab={false}
+      isOpen={true}
+      isProgressive={false}
+      isSelected={true}
+      isVariableCountWidth={true}
+      key="0"
+      onSelect={[Function]}
+    >
+      <Tabs.Title>
+        One
+      </Tabs.Title>
+      One content
+    </Tabs.Tab>
+    <Tabs.Tab
+      Title="Two"
+      count={6546541612}
+      index={1}
+      isLastTab={false}
+      isOpen={true}
+      isProgressive={false}
+      isSelected={false}
+      isVariableCountWidth={true}
+      key="1"
+      onSelect={[Function]}
+    >
+      <Tabs.Title>
+        Two
+      </Tabs.Title>
+      Two content
+    </Tabs.Tab>
+    <Tabs.Tab
+      Title="Three"
+      count={7}
+      index={2}
+      isLastTab={false}
+      isOpen={true}
+      isProgressive={false}
+      isSelected={false}
+      isVariableCountWidth={true}
+      key="2"
+      onSelect={[Function]}
+    >
+      <Tabs.Title>
+        Three
+      </Tabs.Title>
+      Three content
+    </Tabs.Tab>
+    <Tabs.Tab
+      Title="Three"
+      count={123}
+      index={3}
+      isDisabled={true}
+      isLastTab={true}
+      isOpen={true}
+      isProgressive={false}
+      isSelected={false}
+      isVariableCountWidth={true}
+      key="3"
+      onSelect={[Function]}
+    >
+      <Tabs.Title>
+        Three
+      </Tabs.Title>
+      Three content
+    </Tabs.Tab>
+  </ul>
+  <div
+    className="lucid-Tabs-content"
+  >
+    <Tabs.Title>
+      One
+    </Tabs.Title>
+    One content
+  </div>
+</div>
+`;
+
 exports[`Tabs [common] example testing should match snapshot(s) for 10-floating 1`] = `
 <div
   className="lucid-Tabs"