diff --git a/ui_framework/components/button/__snapshots__/button.test.js.snap b/ui_framework/components/button/__snapshots__/button.test.js.snap
index 979451ac42be7..552251b84e508 100644
--- a/ui_framework/components/button/__snapshots__/button.test.js.snap
+++ b/ui_framework/components/button/__snapshots__/button.test.js.snap
@@ -6,6 +6,7 @@ exports[`KuiButton Baseline HTML attributes are rendered 1`] = `
   class="kuiButton testClass1 testClass2"
   data-test-subj="test subject string"
   disabled=""
+  type="submit"
 >
   <span
     class="kuiButton__inner"
@@ -23,6 +24,46 @@ exports[`KuiButton Baseline is rendered 1`] = `
 </button>
 `;
 
+exports[`KuiButton Props buttonType basic renders the basic class 1`] = `
+<button
+  class="kuiButton kuiButton--basic"
+>
+  <span
+    class="kuiButton__inner"
+  />
+</button>
+`;
+
+exports[`KuiButton Props buttonType danger renders the danger class 1`] = `
+<button
+  class="kuiButton kuiButton--danger"
+>
+  <span
+    class="kuiButton__inner"
+  />
+</button>
+`;
+
+exports[`KuiButton Props buttonType hollow renders the hollow class 1`] = `
+<button
+  class="kuiButton kuiButton--hollow"
+>
+  <span
+    class="kuiButton__inner"
+  />
+</button>
+`;
+
+exports[`KuiButton Props buttonType primary renders the primary class 1`] = `
+<button
+  class="kuiButton kuiButton--primary"
+>
+  <span
+    class="kuiButton__inner"
+  />
+</button>
+`;
+
 exports[`KuiButton Props children is rendered 1`] = `
 <button
   class="kuiButton"
@@ -108,43 +149,3 @@ exports[`KuiButton Props isLoading renders a spinner 1`] = `
   </span>
 </button>
 `;
-
-exports[`KuiButton Props type basic renders the basic class 1`] = `
-<button
-  class="kuiButton kuiButton--basic"
->
-  <span
-    class="kuiButton__inner"
-  />
-</button>
-`;
-
-exports[`KuiButton Props type danger renders the danger class 1`] = `
-<button
-  class="kuiButton kuiButton--danger"
->
-  <span
-    class="kuiButton__inner"
-  />
-</button>
-`;
-
-exports[`KuiButton Props type hollow renders the hollow class 1`] = `
-<button
-  class="kuiButton kuiButton--hollow"
->
-  <span
-    class="kuiButton__inner"
-  />
-</button>
-`;
-
-exports[`KuiButton Props type primary renders the primary class 1`] = `
-<button
-  class="kuiButton kuiButton--primary"
->
-  <span
-    class="kuiButton__inner"
-  />
-</button>
-`;
diff --git a/ui_framework/components/button/__snapshots__/link_button.test.js.snap b/ui_framework/components/button/__snapshots__/link_button.test.js.snap
index 8c897a6f25220..03021dd6426db 100644
--- a/ui_framework/components/button/__snapshots__/link_button.test.js.snap
+++ b/ui_framework/components/button/__snapshots__/link_button.test.js.snap
@@ -7,6 +7,7 @@ exports[`KuiLinkButton Baseline HTML attributes are rendered (and disabled rende
   data-test-subj="test subject string"
   href="#"
   target="_blank"
+  type="submit"
 >
   <span
     class="kuiButton__inner"
@@ -24,6 +25,46 @@ exports[`KuiLinkButton Baseline is rendered 1`] = `
 </a>
 `;
 
+exports[`KuiLinkButton Props buttonType basic renders the basic class 1`] = `
+<a
+  class="kuiButton kuiButton--basic"
+>
+  <span
+    class="kuiButton__inner"
+  />
+</a>
+`;
+
+exports[`KuiLinkButton Props buttonType danger renders the danger class 1`] = `
+<a
+  class="kuiButton kuiButton--danger"
+>
+  <span
+    class="kuiButton__inner"
+  />
+</a>
+`;
+
+exports[`KuiLinkButton Props buttonType hollow renders the hollow class 1`] = `
+<a
+  class="kuiButton kuiButton--hollow"
+>
+  <span
+    class="kuiButton__inner"
+  />
+</a>
+`;
+
+exports[`KuiLinkButton Props buttonType primary renders the primary class 1`] = `
+<a
+  class="kuiButton kuiButton--primary"
+>
+  <span
+    class="kuiButton__inner"
+  />
+</a>
+`;
+
 exports[`KuiLinkButton Props children is rendered 1`] = `
 <a
   class="kuiButton"
@@ -109,43 +150,3 @@ exports[`KuiLinkButton Props isLoading renders a spinner 1`] = `
   </span>
 </a>
 `;
-
-exports[`KuiLinkButton Props type basic renders the basic class 1`] = `
-<a
-  class="kuiButton kuiButton--basic"
->
-  <span
-    class="kuiButton__inner"
-  />
-</a>
-`;
-
-exports[`KuiLinkButton Props type danger renders the danger class 1`] = `
-<a
-  class="kuiButton kuiButton--danger"
->
-  <span
-    class="kuiButton__inner"
-  />
-</a>
-`;
-
-exports[`KuiLinkButton Props type hollow renders the hollow class 1`] = `
-<a
-  class="kuiButton kuiButton--hollow"
->
-  <span
-    class="kuiButton__inner"
-  />
-</a>
-`;
-
-exports[`KuiLinkButton Props type primary renders the primary class 1`] = `
-<a
-  class="kuiButton kuiButton--primary"
->
-  <span
-    class="kuiButton__inner"
-  />
-</a>
-`;
diff --git a/ui_framework/components/button/__snapshots__/submit_button.test.js.snap b/ui_framework/components/button/__snapshots__/submit_button.test.js.snap
index 12de82c013601..d65ecc2a506bf 100644
--- a/ui_framework/components/button/__snapshots__/submit_button.test.js.snap
+++ b/ui_framework/components/button/__snapshots__/submit_button.test.js.snap
@@ -17,38 +17,38 @@ exports[`KuiSubmitButton Baseline is rendered 1`] = `
 />
 `;
 
-exports[`KuiSubmitButton Props children is rendered as value 1`] = `
+exports[`KuiSubmitButton Props buttonType basic renders the basic class 1`] = `
 <input
-  class="kuiButton"
+  class="kuiButton kuiButton--basic"
   type="submit"
-  value="Hello"
 />
 `;
 
-exports[`KuiSubmitButton Props type basic renders the basic class 1`] = `
+exports[`KuiSubmitButton Props buttonType danger renders the danger class 1`] = `
 <input
-  class="kuiButton kuiButton--basic"
+  class="kuiButton kuiButton--danger"
   type="submit"
 />
 `;
 
-exports[`KuiSubmitButton Props type danger renders the danger class 1`] = `
+exports[`KuiSubmitButton Props buttonType hollow renders the hollow class 1`] = `
 <input
-  class="kuiButton kuiButton--danger"
+  class="kuiButton kuiButton--hollow"
   type="submit"
 />
 `;
 
-exports[`KuiSubmitButton Props type hollow renders the hollow class 1`] = `
+exports[`KuiSubmitButton Props buttonType primary renders the primary class 1`] = `
 <input
-  class="kuiButton kuiButton--hollow"
+  class="kuiButton kuiButton--primary"
   type="submit"
 />
 `;
 
-exports[`KuiSubmitButton Props type primary renders the primary class 1`] = `
+exports[`KuiSubmitButton Props children is rendered as value 1`] = `
 <input
-  class="kuiButton kuiButton--primary"
+  class="kuiButton"
   type="submit"
+  value="Hello"
 />
 `;
diff --git a/ui_framework/components/button/button.js b/ui_framework/components/button/button.js
index 32868f2c137a1..1506c7b9e6bfb 100644
--- a/ui_framework/components/button/button.js
+++ b/ui_framework/components/button/button.js
@@ -26,8 +26,8 @@ const buttonTypeToClassNameMap = {
   primary: 'kuiButton--primary',
 };
 
-const getClassName = ({ className, type, hasIcon = false }) =>
-  classNames('kuiButton', className, buttonTypeToClassNameMap[type], {
+const getClassName = ({ className, buttonType, hasIcon = false }) =>
+  classNames('kuiButton', className, buttonTypeToClassNameMap[buttonType], {
     'kuiButton--iconText': hasIcon,
   });
 
@@ -63,7 +63,7 @@ const KuiButton = ({
   isLoading,
   iconPosition = DEFAULT_ICON_POSITION,
   className,
-  type,
+  buttonType,
   icon,
   children,
   ...rest
@@ -72,7 +72,7 @@ const KuiButton = ({
     <button
       className={getClassName({
         className,
-        type,
+        buttonType,
         hasIcon: icon || isLoading,
       })}
       {...rest}
@@ -93,7 +93,7 @@ KuiButton.propTypes = {
   iconPosition: PropTypes.oneOf(ICON_POSITIONS),
   children: PropTypes.node,
   isLoading: PropTypes.bool,
-  type: PropTypes.oneOf(BUTTON_TYPES),
+  buttonType: PropTypes.oneOf(BUTTON_TYPES),
   className: PropTypes.string,
 };
 
@@ -103,7 +103,7 @@ const KuiLinkButton = ({
   iconPosition = DEFAULT_ICON_POSITION,
   className,
   disabled,
-  type,
+  buttonType,
   children,
   ...rest
 }) => {
@@ -115,7 +115,7 @@ const KuiLinkButton = ({
 
   const classes = classNames(getClassName({
     className,
-    type,
+    buttonType,
     hasIcon: icon || isLoading,
   }), { 'kuiButton-isDisabled': disabled });
 
@@ -140,14 +140,14 @@ KuiLinkButton.propTypes = {
   icon: PropTypes.node,
   iconPosition: PropTypes.oneOf(ICON_POSITIONS),
   isLoading: PropTypes.bool,
-  type: PropTypes.oneOf(BUTTON_TYPES),
+  buttonType: PropTypes.oneOf(BUTTON_TYPES),
   className: PropTypes.string,
   children: PropTypes.node,
 };
 
 const KuiSubmitButton = ({
   className,
-  type,
+  buttonType,
   children,
   ...rest
 }) => {
@@ -156,7 +156,7 @@ const KuiSubmitButton = ({
     <input
       type="submit"
       value={children}
-      className={getClassName({ className, type })}
+      className={getClassName({ className, buttonType })}
       {...rest}
     />
   );
@@ -164,7 +164,7 @@ const KuiSubmitButton = ({
 
 KuiSubmitButton.propTypes = {
   children: PropTypes.string,
-  type: PropTypes.oneOf(BUTTON_TYPES),
+  buttonType: PropTypes.oneOf(BUTTON_TYPES),
   className: PropTypes.string,
 };
 
diff --git a/ui_framework/components/button/button.test.js b/ui_framework/components/button/button.test.js
index 85edd8c2ef151..329831d245202 100644
--- a/ui_framework/components/button/button.test.js
+++ b/ui_framework/components/button/button.test.js
@@ -24,6 +24,7 @@ describe('KuiButton', () => {
           aria-label="aria label"
           className="testClass1 testClass2"
           data-test-subj="test subject string"
+          type="submit"
           disabled
         />
       );
@@ -34,11 +35,11 @@ describe('KuiButton', () => {
   });
 
   describe('Props', () => {
-    describe('type', () => {
-      BUTTON_TYPES.forEach(type => {
-        describe(type, () => {
-          test(`renders the ${type} class`, () => {
-            const $button = render(<KuiButton type={type} />);
+    describe('buttonType', () => {
+      BUTTON_TYPES.forEach(buttonType => {
+        describe(buttonType, () => {
+          test(`renders the ${buttonType} class`, () => {
+            const $button = render(<KuiButton buttonType={buttonType} />);
             expect($button).toMatchSnapshot();
           });
         });
diff --git a/ui_framework/components/button/link_button.test.js b/ui_framework/components/button/link_button.test.js
index 7cccc1ab099fb..817d1a59e97cb 100644
--- a/ui_framework/components/button/link_button.test.js
+++ b/ui_framework/components/button/link_button.test.js
@@ -24,6 +24,7 @@ describe('KuiLinkButton', () => {
           className="testClass1 testClass2"
           data-test-subj="test subject string"
           disabled
+          type="submit"
           href="#"
           target="_blank"
         />
@@ -35,11 +36,11 @@ describe('KuiLinkButton', () => {
   });
 
   describe('Props', () => {
-    describe('type', () => {
-      BUTTON_TYPES.forEach(type => {
-        describe(type, () => {
-          test(`renders the ${type} class`, () => {
-            const $button = render(<KuiLinkButton type={type} />);
+    describe('buttonType', () => {
+      BUTTON_TYPES.forEach(buttonType => {
+        describe(buttonType, () => {
+          test(`renders the ${buttonType} class`, () => {
+            const $button = render(<KuiLinkButton buttonType={buttonType} />);
             expect($button).toMatchSnapshot();
           });
         });
diff --git a/ui_framework/components/button/submit_button.test.js b/ui_framework/components/button/submit_button.test.js
index 62462d5154ff7..9d301570d523b 100644
--- a/ui_framework/components/button/submit_button.test.js
+++ b/ui_framework/components/button/submit_button.test.js
@@ -34,11 +34,11 @@ describe('KuiSubmitButton', () => {
   });
 
   describe('Props', () => {
-    describe('type', () => {
-      BUTTON_TYPES.forEach(type => {
-        describe(type, () => {
-          test(`renders the ${type} class`, () => {
-            const $button = render(<KuiSubmitButton type={type} />);
+    describe('buttonType', () => {
+      BUTTON_TYPES.forEach(buttonType => {
+        describe(buttonType, () => {
+          test(`renders the ${buttonType} class`, () => {
+            const $button = render(<KuiSubmitButton buttonType={buttonType} />);
             expect($button).toMatchSnapshot();
           });
         });
diff --git a/ui_framework/components/modal/confirm_modal.js b/ui_framework/components/modal/confirm_modal.js
index 806db8f10d991..6655f3050a7f5 100644
--- a/ui_framework/components/modal/confirm_modal.js
+++ b/ui_framework/components/modal/confirm_modal.js
@@ -64,7 +64,7 @@ export function KuiConfirmModal({
 
       <KuiModalFooter>
         <KuiButton
-          type="hollow"
+          buttonType="hollow"
           autoFocus={ defaultFocusedButton === CANCEL_BUTTON }
           data-test-subj="confirmModalCancelButton"
           onClick={ onCancel }
@@ -72,7 +72,7 @@ export function KuiConfirmModal({
           {cancelButtonText}
         </KuiButton>
         <KuiButton
-          type="primary"
+          buttonType="primary"
           autoFocus={ defaultFocusedButton === CONFIRM_BUTTON }
           data-test-subj="confirmModalConfirmButton"
           onClick={ onConfirm }
diff --git a/ui_framework/doc_site/src/views/button/button_basic.js b/ui_framework/doc_site/src/views/button/button_basic.js
index 2dcd6357ba23e..7ed1010895f1d 100644
--- a/ui_framework/doc_site/src/views/button/button_basic.js
+++ b/ui_framework/doc_site/src/views/button/button_basic.js
@@ -7,7 +7,7 @@ import {
 export default () => (
   <div>
     <KuiButton
-      type="basic"
+      buttonType="basic"
       onClick={() => window.alert('Button clicked')}
     >
       Basic button
@@ -16,7 +16,7 @@ export default () => (
     <br />
 
     <KuiButton
-      type="basic"
+      buttonType="basic"
       onClick={() => window.alert('Button clicked')}
       disabled
     >
diff --git a/ui_framework/doc_site/src/views/button/button_danger.js b/ui_framework/doc_site/src/views/button/button_danger.js
index 7650dfe989ab5..3ae2807b0f48f 100644
--- a/ui_framework/doc_site/src/views/button/button_danger.js
+++ b/ui_framework/doc_site/src/views/button/button_danger.js
@@ -6,14 +6,14 @@ import {
 
 export default () => (
   <div>
-    <KuiButton type="danger">
+    <KuiButton buttonType="danger">
       Danger button
     </KuiButton>
 
     <br />
 
     <KuiButton
-      type="danger"
+      buttonType="danger"
       disabled
     >
       Danger button, disabled
diff --git a/ui_framework/doc_site/src/views/button/button_elements.js b/ui_framework/doc_site/src/views/button/button_elements.js
index 2891b20f63699..77e9867e32927 100644
--- a/ui_framework/doc_site/src/views/button/button_elements.js
+++ b/ui_framework/doc_site/src/views/button/button_elements.js
@@ -8,7 +8,7 @@ import {
 
 export default () => (
   <div>
-    <KuiButton type="basic">
+    <KuiButton buttonType="basic">
       Button element
     </KuiButton>
 
@@ -18,7 +18,7 @@ export default () => (
       e.preventDefault();
       window.alert('Submit');
     }}>
-      <KuiSubmitButton type="basic">
+      <KuiSubmitButton buttonType="basic">
         Submit input element
       </KuiSubmitButton>
     </form>
@@ -28,7 +28,7 @@ export default () => (
       e.preventDefault();
       window.alert('Submit');
     }}>
-      <KuiSubmitButton type="basic" disabled>
+      <KuiSubmitButton buttonType="basic" disabled>
         Submit input element, disabled
       </KuiSubmitButton>
     </form>
@@ -36,7 +36,7 @@ export default () => (
     &nbsp;
 
     <KuiLinkButton
-      type="basic"
+      buttonType="basic"
       href="http://www.google.com"
       target="_blank"
     >
@@ -46,7 +46,7 @@ export default () => (
     &nbsp;
 
     <KuiLinkButton
-      type="basic"
+      buttonType="basic"
       href="http://www.google.com"
       target="_blank"
       disabled
diff --git a/ui_framework/doc_site/src/views/button/button_group.js b/ui_framework/doc_site/src/views/button/button_group.js
index 36bf80bc7e292..2d93f95e34069 100644
--- a/ui_framework/doc_site/src/views/button/button_group.js
+++ b/ui_framework/doc_site/src/views/button/button_group.js
@@ -8,15 +8,15 @@ import {
 export default () => (
   <div>
     <KuiButtonGroup>
-      <KuiButton type="basic">
+      <KuiButton buttonType="basic">
         Cancel
       </KuiButton>
 
-      <KuiButton type="basic">
+      <KuiButton buttonType="basic">
         Duplicate
       </KuiButton>
 
-      <KuiButton type="primary">
+      <KuiButton buttonType="primary">
         Save
       </KuiButton>
     </KuiButtonGroup>
@@ -24,7 +24,7 @@ export default () => (
     <br />
 
     <KuiButtonGroup>
-      <KuiButton type="basic">
+      <KuiButton buttonType="basic">
         Button group with one button
       </KuiButton>
     </KuiButtonGroup>
diff --git a/ui_framework/doc_site/src/views/button/button_group_united.js b/ui_framework/doc_site/src/views/button/button_group_united.js
index af05596ae636f..3f6a1a54e101f 100644
--- a/ui_framework/doc_site/src/views/button/button_group_united.js
+++ b/ui_framework/doc_site/src/views/button/button_group_united.js
@@ -9,15 +9,15 @@ import {
 export default () => (
   <div>
     <KuiButtonGroup isUnited>
-      <KuiButton type="basic">
+      <KuiButton buttonType="basic">
         Option A
       </KuiButton>
 
-      <KuiButton type="basic">
+      <KuiButton buttonType="basic">
         Option B
       </KuiButton>
 
-      <KuiButton type="basic">
+      <KuiButton buttonType="basic">
         Option C
       </KuiButton>
     </KuiButtonGroup>
@@ -26,12 +26,12 @@ export default () => (
 
     <KuiButtonGroup isUnited>
       <KuiButton
-        type="basic"
+        buttonType="basic"
         icon={<KuiButtonIcon type="previous" />}
       />
 
       <KuiButton
-        type="basic"
+        buttonType="basic"
         icon={<KuiButtonIcon type="next" />}
       />
     </KuiButtonGroup>
diff --git a/ui_framework/doc_site/src/views/button/button_hollow.js b/ui_framework/doc_site/src/views/button/button_hollow.js
index 6532e6af1eaf9..da0d13cf04400 100644
--- a/ui_framework/doc_site/src/views/button/button_hollow.js
+++ b/ui_framework/doc_site/src/views/button/button_hollow.js
@@ -6,14 +6,14 @@ import {
 
 export default () => (
   <div>
-    <KuiButton type="hollow">
+    <KuiButton buttonType="hollow">
       Hollow button
     </KuiButton>
 
     <br />
 
     <KuiButton
-      type="hollow"
+      buttonType="hollow"
       disabled
     >
       Hollow button, disabled
diff --git a/ui_framework/doc_site/src/views/button/button_loading.js b/ui_framework/doc_site/src/views/button/button_loading.js
index 6b140bb5983e3..61cc9301de2f2 100644
--- a/ui_framework/doc_site/src/views/button/button_loading.js
+++ b/ui_framework/doc_site/src/views/button/button_loading.js
@@ -34,7 +34,7 @@ export default class LoadingButton extends Component {
     return (
       <div>
         <KuiButton
-          type="basic"
+          buttonType="basic"
           onClick={this.onClick}
           isLoading={this.state.isLoading}
           disabled={this.state.isLoading}
@@ -45,7 +45,7 @@ export default class LoadingButton extends Component {
         <br />
 
         <KuiButton
-          type="primary"
+          buttonType="primary"
           onClick={this.onClick}
           icon={<KuiButtonIcon type="create" />}
           isLoading={this.state.isLoading}
diff --git a/ui_framework/doc_site/src/views/button/button_primary.js b/ui_framework/doc_site/src/views/button/button_primary.js
index dbbf1e242208f..0f2713f0bd584 100644
--- a/ui_framework/doc_site/src/views/button/button_primary.js
+++ b/ui_framework/doc_site/src/views/button/button_primary.js
@@ -6,14 +6,14 @@ import {
 
 export default () => (
   <div>
-    <KuiButton type="primary">
+    <KuiButton buttonType="primary">
       Primary button
     </KuiButton>
 
     <br />
 
     <KuiButton
-      type="primary"
+      buttonType="primary"
       disabled
     >
       Primary button, disabled
diff --git a/ui_framework/doc_site/src/views/button/button_with_icon.js b/ui_framework/doc_site/src/views/button/button_with_icon.js
index 1039953f73c15..124164d0badda 100644
--- a/ui_framework/doc_site/src/views/button/button_with_icon.js
+++ b/ui_framework/doc_site/src/views/button/button_with_icon.js
@@ -8,7 +8,7 @@ import {
 export default () => (
   <div>
     <KuiButton
-      type="primary"
+      buttonType="primary"
       icon={<KuiButtonIcon type="create" />}
     >
       Create
@@ -17,7 +17,7 @@ export default () => (
     <br />
 
     <KuiButton
-      type="danger"
+      buttonType="danger"
       icon={<KuiButtonIcon type="delete" />}
     >
       Delete
@@ -26,7 +26,7 @@ export default () => (
     <br />
 
     <KuiButton
-      type="basic"
+      buttonType="basic"
       icon={<KuiButtonIcon type="previous" />}
     >
       Previous
@@ -35,7 +35,7 @@ export default () => (
     <br />
 
     <KuiButton
-      type="basic"
+      buttonType="basic"
       icon={<KuiButtonIcon type="next" />}
       iconPosition='right'
     >
@@ -45,7 +45,7 @@ export default () => (
     <br />
 
     <KuiButton
-      type="basic"
+      buttonType="basic"
       icon={<KuiButtonIcon type="loading" />}
     >
       Loading
@@ -54,7 +54,7 @@ export default () => (
     <br />
 
     <KuiButton
-      type="basic"
+      buttonType="basic"
       icon={<KuiButtonIcon className="fa-plane" />}
     />
   </div>
diff --git a/ui_framework/doc_site/src/views/button/buttons_in_tool_bar.js b/ui_framework/doc_site/src/views/button/buttons_in_tool_bar.js
index 91c62478ad356..86f2bdf523673 100644
--- a/ui_framework/doc_site/src/views/button/buttons_in_tool_bar.js
+++ b/ui_framework/doc_site/src/views/button/buttons_in_tool_bar.js
@@ -6,34 +6,34 @@ import {
 
 export default () => (
   <div className="kuiToolBar">
-    <KuiButton type="basic">
+    <KuiButton buttonType="basic">
       Basic button
     </KuiButton>
 
     <KuiButton
-      type="basic"
+      buttonType="basic"
       disabled
     >
       Basic button, disabled
     </KuiButton>
 
-    <KuiButton type="primary">
+    <KuiButton buttonType="primary">
       Primary button
     </KuiButton>
 
     <KuiButton
-      type="primary"
+      buttonType="primary"
       disabled
     >
       Primary button, disabled
     </KuiButton>
 
-    <KuiButton type="danger">
+    <KuiButton buttonType="danger">
       Danger button
     </KuiButton>
 
     <KuiButton
-      type="danger"
+      buttonType="danger"
       disabled
     >
       Danger button, disabled
diff --git a/ui_framework/doc_site/src/views/modal/confirm_modal_example.js b/ui_framework/doc_site/src/views/modal/confirm_modal_example.js
index e6f7719474235..4dcdb7fd6c7ef 100644
--- a/ui_framework/doc_site/src/views/modal/confirm_modal_example.js
+++ b/ui_framework/doc_site/src/views/modal/confirm_modal_example.js
@@ -27,7 +27,7 @@ export class ConfirmModalExample extends React.Component {
   render() {
     return (
       <div>
-        <KuiButton type="primary" onClick={this.showModal}>
+        <KuiButton buttonType="primary" onClick={this.showModal}>
           Show Modal
         </KuiButton>
         {
diff --git a/ui_framework/doc_site/src/views/tool_bar/tool_bar.js b/ui_framework/doc_site/src/views/tool_bar/tool_bar.js
index 9b0c2f71d865b..03ceff52b4ba7 100644
--- a/ui_framework/doc_site/src/views/tool_bar/tool_bar.js
+++ b/ui_framework/doc_site/src/views/tool_bar/tool_bar.js
@@ -22,14 +22,14 @@ export const ToolBar = () => (
 
     <div className="kuiToolBarSection">
       <KuiButton
-        type="primary"
+        buttonType="primary"
         icon={<KuiButtonIcon type="create" />}
       >
         Create
       </KuiButton>
 
       <KuiButton
-        type="danger"
+        buttonType="danger"
         icon={<KuiButtonIcon type="delete" />}
       >
         Delete
@@ -44,12 +44,12 @@ export const ToolBar = () => (
 
       <KuiButtonGroup isUnited>
         <KuiButton
-          type="basic"
+          buttonType="basic"
           icon={<KuiButtonIcon type="previous" />}
         >
         </KuiButton>
         <KuiButton
-          type="basic"
+          buttonType="basic"
           icon={<KuiButtonIcon type="next" />}
         >
         </KuiButton>
diff --git a/ui_framework/doc_site/src/views/tool_bar/tool_bar_footer.js b/ui_framework/doc_site/src/views/tool_bar/tool_bar_footer.js
index b5c8f931ea600..3451d0993a8f9 100644
--- a/ui_framework/doc_site/src/views/tool_bar/tool_bar_footer.js
+++ b/ui_framework/doc_site/src/views/tool_bar/tool_bar_footer.js
@@ -22,11 +22,11 @@ export const ToolBarFooter = () => (
 
       <KuiButtonGroup isUnited>
         <KuiButton
-          type="basic"
+          buttonType="basic"
           icon={<KuiButtonIcon type="previous" />}
         ></KuiButton>
         <KuiButton
-          type="basic"
+          buttonType="basic"
           icon={<KuiButtonIcon type="next" />}
         ></KuiButton>
       </KuiButtonGroup>