diff --git a/ui/components/breadcrumbs/index.react.jsx b/ui/components/breadcrumbs/index.react.jsx
index f2776d8265..7a8bace2ea 100644
--- a/ui/components/breadcrumbs/index.react.jsx
+++ b/ui/components/breadcrumbs/index.react.jsx
@@ -3,6 +3,7 @@
 
 import React from 'react';
 import classNames from 'classnames';
+import PropTypes from 'prop-types';
 
 const Crumb = props => (
   <li className={classNames('slds-breadcrumb__item', props.className)}>
@@ -10,7 +11,7 @@ const Crumb = props => (
   </li>
 );
 
-Crumb.propTypes = { href: React.PropTypes.string };
+Crumb.propTypes = { href: PropTypes.string };
 
 const BreadCrumbs = props => (
   <nav {...props} role="navigation" aria-label="Breadcrumbs">
diff --git a/ui/components/dynamic-icons/ellie/example.jsx b/ui/components/dynamic-icons/ellie/example.jsx
index e16e609723..576eb21ab8 100644
--- a/ui/components/dynamic-icons/ellie/example.jsx
+++ b/ui/components/dynamic-icons/ellie/example.jsx
@@ -4,6 +4,7 @@
 import React from 'react';
 import _ from '../../../shared/helpers';
 import classNames from 'classnames';
+import PropTypes from 'prop-types';
 
 // This icon is a sprite of 20 frames laid out horizontally
 // Each frame is composed of 2 circles positioned on top of each other
@@ -36,8 +37,8 @@ export const Ellie = props => (
 );
 
 Ellie.propTypes = {
-  title: React.PropTypes.string.isRequired,
-  assistiveText: React.PropTypes.string.isRequired
+  title: PropTypes.string.isRequired,
+  assistiveText: PropTypes.string.isRequired
 };
 
 /* -----------------------------------------------------------------------------
diff --git a/ui/components/dynamic-icons/trend/example.jsx b/ui/components/dynamic-icons/trend/example.jsx
index 90eb88a45a..201a6b9abc 100644
--- a/ui/components/dynamic-icons/trend/example.jsx
+++ b/ui/components/dynamic-icons/trend/example.jsx
@@ -4,6 +4,7 @@
 import React from 'react';
 import _ from '../../../shared/helpers';
 import classNames from 'classnames';
+import PropTypes from 'prop-types';
 
 /* -----------------------------------------------------------------------------
     Private
@@ -33,8 +34,8 @@ let Trend = props => {
 };
 
 Trend.propTypes = {
-  title: React.PropTypes.string.isRequired,
-  assistiveText: React.PropTypes.string.isRequired
+  title: PropTypes.string.isRequired,
+  assistiveText: PropTypes.string.isRequired
 };
 
 /* -----------------------------------------------------------------------------
diff --git a/ui/components/dynamic-icons/typing/example.jsx b/ui/components/dynamic-icons/typing/example.jsx
index 5e550f3612..b1a4500a41 100644
--- a/ui/components/dynamic-icons/typing/example.jsx
+++ b/ui/components/dynamic-icons/typing/example.jsx
@@ -3,6 +3,7 @@
 
 import React from 'react';
 import classNames from 'classnames';
+import PropTypes from 'prop-types';
 
 export const TypingIcon = props => (
   <span
@@ -22,10 +23,10 @@ export const TypingIcon = props => (
 );
 
 TypingIcon.propTypes = {
-  isAnimated: React.PropTypes.bool,
-  isPaused: React.PropTypes.bool,
-  title: React.PropTypes.string.isRequired,
-  assistiveText: React.PropTypes.string
+  isAnimated: PropTypes.bool,
+  isPaused: PropTypes.bool,
+  title: PropTypes.string.isRequired,
+  assistiveText: PropTypes.string
 };
 
 export default (
diff --git a/ui/components/heading/index.react.jsx b/ui/components/heading/index.react.jsx
index 36285340aa..48c050021b 100644
--- a/ui/components/heading/index.react.jsx
+++ b/ui/components/heading/index.react.jsx
@@ -4,6 +4,7 @@
 import _ from '../../shared/helpers';
 import React from 'react';
 import classNames from 'classnames';
+import PropTypes from 'prop-types';
 
 import Truncate from '../../shared/truncate/index.react.jsx';
 
@@ -41,8 +42,8 @@ class Heading extends React.Component {
 }
 
 Heading.propTypes = {
-  flavor: React.PropTypes.oneOf(['label', 'medium']),
-  truncate: React.PropTypes.number
+  flavor: PropTypes.oneOf(['label', 'medium']),
+  truncate: PropTypes.number
 };
 
 Heading.defaultProps = { flavor: 'label' };
diff --git a/ui/components/progress-ring/index.jsx b/ui/components/progress-ring/index.jsx
index dda5049550..3d59c67a6d 100644
--- a/ui/components/progress-ring/index.jsx
+++ b/ui/components/progress-ring/index.jsx
@@ -3,6 +3,7 @@
 
 import React, { Component } from 'react';
 import classNames from 'classnames';
+import PropTypes from 'prop-types';
 
 class ProgressRing extends Component {
   getCoordinatesForPercent(percent) {
@@ -48,7 +49,7 @@ class ProgressRing extends Component {
 }
 
 ProgressRing.propTypes = {
-  percent: React.PropTypes.number
+  percent: PropTypes.number
 };
 
 ProgressRing.defaultProps = {
diff --git a/ui/components/tabs/index.react.jsx b/ui/components/tabs/index.react.jsx
index 483648bfa2..f29d4540ed 100644
--- a/ui/components/tabs/index.react.jsx
+++ b/ui/components/tabs/index.react.jsx
@@ -4,8 +4,9 @@
 import _ from '../../shared/helpers';
 import React from 'react';
 import classNames from 'classnames';
+import PropTypes from 'prop-types';
 
-const PT = React.PropTypes;
+const PT = PropTypes;
 
 class TabContent extends React.Component {
   render() {
diff --git a/ui/shared/svg-icon/index.jsx b/ui/shared/svg-icon/index.jsx
index 1b252c0d3e..cc6ed05b44 100644
--- a/ui/shared/svg-icon/index.jsx
+++ b/ui/shared/svg-icon/index.jsx
@@ -10,6 +10,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 
 class SvgIcon extends React.Component {
   render() {
@@ -33,9 +34,9 @@ class SvgIcon extends React.Component {
 }
 
 SvgIcon.propTypes = {
-  className: React.PropTypes.string,
-  sprite: React.PropTypes.string,
-  symbol: React.PropTypes.string
+  className: PropTypes.string,
+  sprite: PropTypes.string,
+  symbol: PropTypes.string
 };
 
 export default SvgIcon;
diff --git a/ui/shared/truncate/index.react.jsx b/ui/shared/truncate/index.react.jsx
index 7ea16d71e9..1b024934f8 100644
--- a/ui/shared/truncate/index.react.jsx
+++ b/ui/shared/truncate/index.react.jsx
@@ -3,6 +3,7 @@
 
 import _ from '../helpers';
 import React from 'react';
+import PropTypes from 'prop-types';
 
 class Truncate extends React.Component {
   // TODO: Remove span
@@ -16,6 +17,6 @@ class Truncate extends React.Component {
   }
 }
 
-Truncate.propTypes = { truncate: React.PropTypes.number };
+Truncate.propTypes = { truncate: PropTypes.number };
 
 export default Truncate;
diff --git a/ui/utilities/media-objects/index.react.jsx b/ui/utilities/media-objects/index.react.jsx
index 7032984b47..355903dcbc 100644
--- a/ui/utilities/media-objects/index.react.jsx
+++ b/ui/utilities/media-objects/index.react.jsx
@@ -3,6 +3,7 @@
 
 import React from 'react';
 import classNames from 'classnames';
+import PropTypes from 'prop-types';
 
 class Component extends React.Component {
   render() {
@@ -42,13 +43,13 @@ class Component extends React.Component {
 
 Component.displayName = 'MediaObject';
 Component.PropTypes = {
-  figureLeft: React.PropTypes.node,
-  figureLeftClassName: React.PropTypes.string,
-  figureRight: React.PropTypes.node,
-  figureRightClassName: React.PropTypes.string,
-  figureCenter: React.PropTypes.node,
-  figureCenterClassName: React.PropTypes.string,
-  flavor: React.PropTypes.oneOf(['center', 'small', 'stacked'])
+  figureLeft: PropTypes.node,
+  figureLeftClassName: PropTypes.string,
+  figureRight: PropTypes.node,
+  figureRightClassName: PropTypes.string,
+  figureCenter: PropTypes.node,
+  figureCenterClassName: PropTypes.string,
+  flavor: PropTypes.oneOf(['center', 'small', 'stacked'])
 };
 
 export default Component;