diff --git a/packages/grafana-ui/src/components/TimePicker/TimePicker.story.tsx b/packages/grafana-ui/src/components/TimePicker/TimeRangePicker.story.tsx
similarity index 80%
rename from packages/grafana-ui/src/components/TimePicker/TimePicker.story.tsx
rename to packages/grafana-ui/src/components/TimePicker/TimeRangePicker.story.tsx
index 13de03079ce..525eea27fad 100644
--- a/packages/grafana-ui/src/components/TimePicker/TimePicker.story.tsx
+++ b/packages/grafana-ui/src/components/TimePicker/TimeRangePicker.story.tsx
@@ -2,16 +2,16 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 
-import { TimePicker } from './TimePicker';
+import { TimeRangePicker } from './TimeRangePicker';
 import { UseState } from '../../utils/storybook/UseState';
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 import { TimeFragment, dateTime } from '@grafana/data';
 
-const TimePickerStories = storiesOf('General/TimePicker', module);
+const TimeRangePickerStories = storiesOf('General/TimeRangePicker', module);
 
-TimePickerStories.addDecorator(withCenteredStory);
+TimeRangePickerStories.addDecorator(withCenteredStory);
 
-TimePickerStories.add('default', () => {
+TimeRangePickerStories.add('default', () => {
   return (
     <UseState
       initialState={{
@@ -22,7 +22,7 @@ TimePickerStories.add('default', () => {
     >
       {(value, updateValue) => {
         return (
-          <TimePicker
+          <TimeRangePicker
             timeZone="browser"
             value={value}
             onChange={timeRange => {
diff --git a/packages/grafana-ui/src/components/TimePicker/TimePicker.test.tsx b/packages/grafana-ui/src/components/TimePicker/TimeRangePicker.test.tsx
similarity index 87%
rename from packages/grafana-ui/src/components/TimePicker/TimePicker.test.tsx
rename to packages/grafana-ui/src/components/TimePicker/TimeRangePicker.test.tsx
index c96b98f7401..7f95a622fde 100644
--- a/packages/grafana-ui/src/components/TimePicker/TimePicker.test.tsx
+++ b/packages/grafana-ui/src/components/TimePicker/TimeRangePicker.test.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import { UnthemedTimePicker } from './TimePicker';
+import { UnthemedTimeRangePicker } from './TimeRangePicker';
 import { dateTime, TimeRange } from '@grafana/data';
-import dark from './../../themes/dark';
+import dark from '../../themes/dark';
 
 const from = '2019-12-17T07:48:27.433Z';
 const to = '2019-12-18T07:48:27.433Z';
@@ -16,7 +16,7 @@ const value: TimeRange = {
 describe('TimePicker', () => {
   it('renders buttons correctly', () => {
     const wrapper = shallow(
-      <UnthemedTimePicker
+      <UnthemedTimeRangePicker
         onChange={value => {}}
         value={value}
         onMoveBackward={() => {}}
@@ -30,7 +30,7 @@ describe('TimePicker', () => {
 
   it('renders content correctly after beeing open', () => {
     const wrapper = shallow(
-      <UnthemedTimePicker
+      <UnthemedTimeRangePicker
         onChange={value => {}}
         value={value}
         onMoveBackward={() => {}}
diff --git a/packages/grafana-ui/src/components/TimePicker/TimePicker.tsx b/packages/grafana-ui/src/components/TimePicker/TimeRangePicker.tsx
similarity index 98%
rename from packages/grafana-ui/src/components/TimePicker/TimePicker.tsx
rename to packages/grafana-ui/src/components/TimePicker/TimeRangePicker.tsx
index a04ddbc89a1..21e727ea96b 100644
--- a/packages/grafana-ui/src/components/TimePicker/TimePicker.tsx
+++ b/packages/grafana-ui/src/components/TimePicker/TimeRangePicker.tsx
@@ -107,7 +107,7 @@ export interface State {
   isOpen: boolean;
 }
 
-export class UnthemedTimePicker extends PureComponent<Props, State> {
+export class UnthemedTimeRangePicker extends PureComponent<Props, State> {
   state: State = {
     isOpen: false,
   };
@@ -245,4 +245,4 @@ const adjustedTime = (time: DateTime, isUTC: boolean) => {
   return time.local() || null;
 };
 
-export const TimePicker = withTheme(UnthemedTimePicker);
+export const TimeRangePicker = withTheme(UnthemedTimeRangePicker);
diff --git a/packages/grafana-ui/src/components/TimePicker/__snapshots__/TimePicker.test.tsx.snap b/packages/grafana-ui/src/components/TimePicker/__snapshots__/TimeRangePicker.test.tsx.snap
similarity index 100%
rename from packages/grafana-ui/src/components/TimePicker/__snapshots__/TimePicker.test.tsx.snap
rename to packages/grafana-ui/src/components/TimePicker/__snapshots__/TimeRangePicker.test.tsx.snap
diff --git a/packages/grafana-ui/src/components/index.ts b/packages/grafana-ui/src/components/index.ts
index 074415d67e1..e7b7636984b 100644
--- a/packages/grafana-ui/src/components/index.ts
+++ b/packages/grafana-ui/src/components/index.ts
@@ -27,7 +27,7 @@ export { PieChart, PieChartType } from './PieChart/PieChart';
 export { UnitPicker } from './UnitPicker/UnitPicker';
 export { StatsPicker } from './StatsPicker/StatsPicker';
 export { RefreshPicker } from './RefreshPicker/RefreshPicker';
-export { TimePicker } from './TimePicker/TimePicker';
+export { TimeRangePicker } from './TimePicker/TimeRangePicker';
 export { TimeOfDayPicker } from './TimePicker/TimeOfDayPicker';
 export { List } from './List/List';
 export { TagsInput } from './TagsInput/TagsInput';
diff --git a/public/app/core/components/TimePicker/TimePickerWithHistory.tsx b/public/app/core/components/TimePicker/TimePickerWithHistory.tsx
index 6ce07a77b05..9a8f34530dd 100644
--- a/public/app/core/components/TimePicker/TimePickerWithHistory.tsx
+++ b/public/app/core/components/TimePicker/TimePickerWithHistory.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { LocalStorageValueProvider } from '../LocalStorageValueProvider';
 import { TimeRange, isDateTime, dateTime } from '@grafana/data';
-import { Props as TimePickerProps, TimePicker } from '@grafana/ui/src/components/TimePicker/TimePicker';
+import { Props as TimePickerProps, TimeRangePicker } from '@grafana/ui/src/components/TimePicker/TimeRangePicker';
 
 const LOCAL_STORAGE_KEY = 'grafana.dashboard.timepicker.history';
 
@@ -12,7 +12,7 @@ export const TimePickerWithHistory: React.FC<Props> = props => {
     <LocalStorageValueProvider<TimeRange[]> storageKey={LOCAL_STORAGE_KEY} defaultValue={[]}>
       {(values, onSaveToStore) => {
         return (
-          <TimePicker
+          <TimeRangePicker
             {...props}
             history={convertIfJson(values)}
             onChange={value => {