diff --git a/components/date_picker/Calendar.js b/components/date_picker/Calendar.js
index 2be22871..fef1b07c 100644
--- a/components/date_picker/Calendar.js
+++ b/components/date_picker/Calendar.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import CssTransitionGroup from 'react-transition-group/CSSTransitionGroup';
+import TransitionGroup from 'react-transition-group/TransitionGroup';
 import { range, getAnimationModule } from '../utils/utils';
 import time from '../utils/time';
 import CalendarMonth from './CalendarMonth';
@@ -135,10 +135,9 @@ const factory = (IconButton) => {
         <div data-react-toolbox="calendar">
           <IconButton id="left" className={theme.prev} icon="chevron_left" onClick={this.changeViewMonth} />
           <IconButton id="right" className={theme.next} icon="chevron_right" onClick={this.changeViewMonth} />
-          <CssTransitionGroup
-            transitionName={animationModule}
-            transitionEnterTimeout={350}
-            transitionLeaveTimeout={350}
+          <TransitionGroup
+            classNames={animationModule}
+            timeout={{ exit: 350, enter: 350 }}
           >
             <CalendarMonth
               enabledDates={this.props.enabledDates}
@@ -153,7 +152,7 @@ const factory = (IconButton) => {
               theme={this.props.theme}
               viewDate={this.state.viewDate}
             />
-          </CssTransitionGroup>
+          </TransitionGroup>
         </div>
       );
     }
diff --git a/components/time_picker/Clock.js b/components/time_picker/Clock.js
index e256fc42..41ebf4bc 100644
--- a/components/time_picker/Clock.js
+++ b/components/time_picker/Clock.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import CssTransitionGroup from 'react-transition-group/CSSTransitionGroup';
+import TransitionGroup from 'react-transition-group/TransitionGroup';
 import { getAnimationModule } from '../utils/utils';
 import time from '../utils/time';
 import Hours from './ClockHours';
@@ -116,10 +116,9 @@ class Clock extends Component {
           style={{ height: this.state.radius * 2 }}
           ref={(node) => { this.placeholderNode = node; }}
         >
-          <CssTransitionGroup
-            transitionName={animationModule}
-            transitionEnterTimeout={500}
-            transitionLeaveTimeout={500}
+          <TransitionGroup
+            classNames={animationModule}
+            timeout={{ exit: 500, enter: 500 }}
           >
             <div
               key={this.props.display}
@@ -129,7 +128,7 @@ class Clock extends Component {
               {this.props.display === 'hours' ? this.renderHours() : null}
               {this.props.display === 'minutes' ? this.renderMinutes() : null}
             </div>
-          </CssTransitionGroup>
+          </TransitionGroup>
         </div>
       </div>
     );