diff --git a/src/core/client/stream/components/Comment.tsx b/src/core/client/stream/components/Comment.tsx
index 836b0dbf0..dea610494 100644
--- a/src/core/client/stream/components/Comment.tsx
+++ b/src/core/client/stream/components/Comment.tsx
@@ -2,7 +2,7 @@ import cn from "classnames";
 import React from "react";
 import { StatelessComponent } from "react";
 
-import { Timestamp, Typography } from "talk-ui/components";
+import { RelativeTime, Typography } from "talk-ui/components";
 
 import * as styles from "./Comment.css";
 import Username from "./Username";
@@ -25,7 +25,7 @@ const Comment: StatelessComponent<CommentProps> = props => {
     <div className={rootClassName} role="article">
       <div className={styles.topBar}>
         {props.author && <Username>{props.author.username}</Username>}
-        <Timestamp date={props.createdAt} />
+        <RelativeTime date={props.createdAt} />
       </div>
       <Typography>{props.body}</Typography>
     </div>
diff --git a/src/core/client/stream/components/__snapshots__/Comment.spec.tsx.snap b/src/core/client/stream/components/__snapshots__/Comment.spec.tsx.snap
index c391feee4..c5fdd9806 100644
--- a/src/core/client/stream/components/__snapshots__/Comment.spec.tsx.snap
+++ b/src/core/client/stream/components/__snapshots__/Comment.spec.tsx.snap
@@ -11,7 +11,7 @@ exports[`renders username and body 1`] = `
     <Username>
       Marvin
     </Username>
-    <withPropsOnChange(Timestamp)
+    <withPropsOnChange(RelativeTime)
       date="1995-12-17T06:24:00.000Z"
     />
   </div>
@@ -32,7 +32,7 @@ exports[`renders with gutterBottom 1`] = `
     <Username>
       Marvin
     </Username>
-    <withPropsOnChange(Timestamp)
+    <withPropsOnChange(RelativeTime)
       date="1995-12-17T06:24:00.000Z"
     />
   </div>
diff --git a/src/core/client/stream/test/__snapshots__/loadMore.spec.tsx.snap b/src/core/client/stream/test/__snapshots__/loadMore.spec.tsx.snap
index 1ea734b2b..ac6fc560a 100644
--- a/src/core/client/stream/test/__snapshots__/loadMore.spec.tsx.snap
+++ b/src/core/client/stream/test/__snapshots__/loadMore.spec.tsx.snap
@@ -57,7 +57,7 @@ exports[`loads more comments 1`] = `
               Markus
             </span>
             <time
-              className="Timestamp-root"
+              className="RelativeTime-root"
               dateTime="2018-07-06T21:24:00.000Z"
               title="2018-07-06T18:24:00"
             >
@@ -85,7 +85,7 @@ exports[`loads more comments 1`] = `
               Lukas
             </span>
             <time
-              className="Timestamp-root"
+              className="RelativeTime-root"
               dateTime="2018-07-06T21:20:00.000Z"
               title="2018-07-06T18:20:00"
             >
@@ -113,7 +113,7 @@ exports[`loads more comments 1`] = `
               Isabelle
             </span>
             <time
-              className="Timestamp-root"
+              className="RelativeTime-root"
               dateTime="2018-07-06T21:14:00.000Z"
               title="2018-07-06T18:14:00"
             >
@@ -189,7 +189,7 @@ exports[`renders comment stream 1`] = `
               Markus
             </span>
             <time
-              className="Timestamp-root"
+              className="RelativeTime-root"
               dateTime="2018-07-06T21:24:00.000Z"
               title="2018-07-06T18:24:00"
             >
@@ -217,7 +217,7 @@ exports[`renders comment stream 1`] = `
               Lukas
             </span>
             <time
-              className="Timestamp-root"
+              className="RelativeTime-root"
               dateTime="2018-07-06T21:20:00.000Z"
               title="2018-07-06T18:20:00"
             >
diff --git a/src/core/client/stream/test/__snapshots__/renderReplies.spec.tsx.snap b/src/core/client/stream/test/__snapshots__/renderReplies.spec.tsx.snap
index 1628b4e7a..f56c4c188 100644
--- a/src/core/client/stream/test/__snapshots__/renderReplies.spec.tsx.snap
+++ b/src/core/client/stream/test/__snapshots__/renderReplies.spec.tsx.snap
@@ -57,7 +57,7 @@ exports[`renders comment stream 1`] = `
               Markus
             </span>
             <time
-              className="Timestamp-root"
+              className="RelativeTime-root"
               dateTime="2018-07-06T21:24:00.000Z"
               title="2018-07-06T18:24:00"
             >
@@ -85,7 +85,7 @@ exports[`renders comment stream 1`] = `
               Markus
             </span>
             <time
-              className="Timestamp-root"
+              className="RelativeTime-root"
               dateTime="2018-07-06T21:24:00.000Z"
               title="2018-07-06T18:24:00"
             >
@@ -118,7 +118,7 @@ exports[`renders comment stream 1`] = `
                   Markus
                 </span>
                 <time
-                  className="Timestamp-root"
+                  className="RelativeTime-root"
                   dateTime="2018-07-06T21:24:00.000Z"
                   title="2018-07-06T18:24:00"
                 >
@@ -144,7 +144,7 @@ exports[`renders comment stream 1`] = `
                   Lukas
                 </span>
                 <time
-                  className="Timestamp-root"
+                  className="RelativeTime-root"
                   dateTime="2018-07-06T21:20:00.000Z"
                   title="2018-07-06T18:20:00"
                 >
diff --git a/src/core/client/stream/test/__snapshots__/renderStream.spec.tsx.snap b/src/core/client/stream/test/__snapshots__/renderStream.spec.tsx.snap
index 66de34d71..e0f5c31f1 100644
--- a/src/core/client/stream/test/__snapshots__/renderStream.spec.tsx.snap
+++ b/src/core/client/stream/test/__snapshots__/renderStream.spec.tsx.snap
@@ -57,7 +57,7 @@ exports[`renders comment stream 1`] = `
               Markus
             </span>
             <time
-              className="Timestamp-root"
+              className="RelativeTime-root"
               dateTime="2018-07-06T21:24:00.000Z"
               title="2018-07-06T18:24:00"
             >
@@ -85,7 +85,7 @@ exports[`renders comment stream 1`] = `
               Lukas
             </span>
             <time
-              className="Timestamp-root"
+              className="RelativeTime-root"
               dateTime="2018-07-06T21:20:00.000Z"
               title="2018-07-06T18:20:00"
             >
diff --git a/src/core/client/stream/test/__snapshots__/showAllReplies.spec.tsx.snap b/src/core/client/stream/test/__snapshots__/showAllReplies.spec.tsx.snap
index 431c7755f..968bbb0b3 100644
--- a/src/core/client/stream/test/__snapshots__/showAllReplies.spec.tsx.snap
+++ b/src/core/client/stream/test/__snapshots__/showAllReplies.spec.tsx.snap
@@ -57,7 +57,7 @@ exports[`renders comment stream 1`] = `
               Markus
             </span>
             <time
-              className="Timestamp-root"
+              className="RelativeTime-root"
               dateTime="2018-07-06T21:24:00.000Z"
               title="2018-07-06T18:24:00"
             >
@@ -90,7 +90,7 @@ exports[`renders comment stream 1`] = `
                   Lukas
                 </span>
                 <time
-                  className="Timestamp-root"
+                  className="RelativeTime-root"
                   dateTime="2018-07-06T21:20:00.000Z"
                   title="2018-07-06T18:20:00"
                 >
@@ -180,7 +180,7 @@ exports[`show all replies 1`] = `
               Markus
             </span>
             <time
-              className="Timestamp-root"
+              className="RelativeTime-root"
               dateTime="2018-07-06T21:24:00.000Z"
               title="2018-07-06T18:24:00"
             >
@@ -213,7 +213,7 @@ exports[`show all replies 1`] = `
                   Lukas
                 </span>
                 <time
-                  className="Timestamp-root"
+                  className="RelativeTime-root"
                   dateTime="2018-07-06T21:20:00.000Z"
                   title="2018-07-06T18:20:00"
                 >
@@ -239,7 +239,7 @@ exports[`show all replies 1`] = `
                   Isabelle
                 </span>
                 <time
-                  className="Timestamp-root"
+                  className="RelativeTime-root"
                   dateTime="2018-07-06T21:14:00.000Z"
                   title="2018-07-06T18:14:00"
                 >
diff --git a/src/core/client/ui/components/Timestamp/Timestamp.css b/src/core/client/ui/components/RelativeTime/RelativeTime.css
similarity index 100%
rename from src/core/client/ui/components/Timestamp/Timestamp.css
rename to src/core/client/ui/components/RelativeTime/RelativeTime.css
diff --git a/src/core/client/ui/components/Timestamp/Timestamp.mdx b/src/core/client/ui/components/RelativeTime/RelativeTime.mdx
similarity index 67%
rename from src/core/client/ui/components/Timestamp/Timestamp.mdx
rename to src/core/client/ui/components/RelativeTime/RelativeTime.mdx
index 591ae963a..3122e8806 100644
--- a/src/core/client/ui/components/Timestamp/Timestamp.mdx
+++ b/src/core/client/ui/components/RelativeTime/RelativeTime.mdx
@@ -1,17 +1,17 @@
 ---
-name: Timestamp
+name: RelativeTime
 menu: UI Kit
 ---
 
 import { Playground } from 'docz'
-import Timestamp from './Timestamp'
+import RelativeTime from './RelativeTime'
 
-# Timestamp
+# RelativeTime
 
 Renders relative time until given `date`.
 
 ## Basic usage
 <Playground>
-  <Timestamp date="2018-07-04T12:14"
+  <RelativeTime date="2018-07-04T12:14"
     formatter={(value, unit, suffix, timestamp) => "".concat(value, " ", unit, " ", suffix)} />
 </Playground>
diff --git a/src/core/client/ui/components/Timestamp/Timestamp.spec.tsx b/src/core/client/ui/components/RelativeTime/RelativeTime.spec.tsx
similarity index 80%
rename from src/core/client/ui/components/Timestamp/Timestamp.spec.tsx
rename to src/core/client/ui/components/RelativeTime/RelativeTime.spec.tsx
index 6235f1e15..0bf3762dc 100644
--- a/src/core/client/ui/components/Timestamp/Timestamp.spec.tsx
+++ b/src/core/client/ui/components/RelativeTime/RelativeTime.spec.tsx
@@ -2,13 +2,13 @@ import React from "react";
 import { create } from "react-test-renderer";
 
 import UIContext from "../UIContext";
-import Timestamp from "./Timestamp";
+import RelativeTime from "./RelativeTime";
 
 it("uses default formatter", () => {
   const props = {
     date: new Date("December 17, 2108 03:24:00").toISOString(),
   };
-  const tree = create(<Timestamp {...props} />).toJSON();
+  const tree = create(<RelativeTime {...props} />).toJSON();
 
   expect(tree).toMatchSnapshot();
 });
@@ -22,7 +22,7 @@ it("uses formatter from context", () => {
   };
   const tree = create(
     <UIContext.Provider value={context}>
-      <Timestamp {...props} />
+      <RelativeTime {...props} />
     </UIContext.Provider>
   ).toJSON();
 
@@ -34,7 +34,7 @@ it("uses formatter from props", () => {
     date: new Date("December 17, 2108 03:24:00").toISOString(),
     formatter: () => "My Props Formatter",
   };
-  const tree = create(<Timestamp {...props} />).toJSON();
+  const tree = create(<RelativeTime {...props} />).toJSON();
 
   expect(tree).toMatchSnapshot();
 });
diff --git a/src/core/client/ui/components/Timestamp/Timestamp.tsx b/src/core/client/ui/components/RelativeTime/RelativeTime.tsx
similarity index 81%
rename from src/core/client/ui/components/Timestamp/Timestamp.tsx
rename to src/core/client/ui/components/RelativeTime/RelativeTime.tsx
index 999587d1e..3a8022656 100644
--- a/src/core/client/ui/components/Timestamp/Timestamp.tsx
+++ b/src/core/client/ui/components/RelativeTime/RelativeTime.tsx
@@ -6,7 +6,7 @@ import { UIContext } from "talk-ui/components";
 import { withStyles } from "talk-ui/hocs";
 import { PropTypesOf } from "talk-ui/types";
 
-import * as styles from "./Timestamp.css";
+import * as styles from "./RelativeTime.css";
 
 interface InnerProps {
   date: string;
@@ -19,7 +19,7 @@ interface InnerProps {
 const defaultFormatter: Formatter = (value, unit, suffix, timestamp: string) =>
   new Date(timestamp).toISOString();
 
-class Timestamp extends React.Component<InnerProps> {
+class RelativeTime extends React.Component<InnerProps> {
   public render() {
     const { date, classes, live, className, formatter } = this.props;
     return (
@@ -37,6 +37,6 @@ class Timestamp extends React.Component<InnerProps> {
   }
 }
 
-const enhanced = withStyles(styles)(Timestamp);
-export type TimestampProps = PropTypesOf<typeof enhanced>;
+const enhanced = withStyles(styles)(RelativeTime);
+export type RelativeTimeProps = PropTypesOf<typeof enhanced>;
 export default enhanced;
diff --git a/src/core/client/ui/components/Timestamp/__snapshots__/Timestamp.spec.tsx.snap b/src/core/client/ui/components/RelativeTime/__snapshots__/RelativeTime.spec.tsx.snap
similarity index 84%
rename from src/core/client/ui/components/Timestamp/__snapshots__/Timestamp.spec.tsx.snap
rename to src/core/client/ui/components/RelativeTime/__snapshots__/RelativeTime.spec.tsx.snap
index a26075415..3f2d9c893 100644
--- a/src/core/client/ui/components/Timestamp/__snapshots__/Timestamp.spec.tsx.snap
+++ b/src/core/client/ui/components/RelativeTime/__snapshots__/RelativeTime.spec.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`uses default formatter 1`] = `
 <time
-  className="Timestamp-root"
+  className="RelativeTime-root"
   dateTime="2108-12-17T06:24:00.000Z"
   title="2108-12-17T06:24:00.000Z"
 >
@@ -12,7 +12,7 @@ exports[`uses default formatter 1`] = `
 
 exports[`uses formatter from context 1`] = `
 <time
-  className="Timestamp-root"
+  className="RelativeTime-root"
   dateTime="2108-12-17T06:24:00.000Z"
   title="2108-12-17T06:24:00.000Z"
 >
@@ -22,7 +22,7 @@ exports[`uses formatter from context 1`] = `
 
 exports[`uses formatter from props 1`] = `
 <time
-  className="Timestamp-root"
+  className="RelativeTime-root"
   dateTime="2108-12-17T06:24:00.000Z"
   title="2108-12-17T06:24:00.000Z"
 >
diff --git a/src/core/client/ui/components/RelativeTime/index.ts b/src/core/client/ui/components/RelativeTime/index.ts
new file mode 100644
index 000000000..8bc2dfb5e
--- /dev/null
+++ b/src/core/client/ui/components/RelativeTime/index.ts
@@ -0,0 +1,2 @@
+export * from "./RelativeTime";
+export { default } from "./RelativeTime";
diff --git a/src/core/client/ui/components/Timestamp/index.ts b/src/core/client/ui/components/Timestamp/index.ts
deleted file mode 100644
index 880bc3790..000000000
--- a/src/core/client/ui/components/Timestamp/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./Timestamp";
-export { default } from "./Timestamp";
diff --git a/src/core/client/ui/components/index.ts b/src/core/client/ui/components/index.ts
index c64dc0c96..f8a7732f3 100644
--- a/src/core/client/ui/components/index.ts
+++ b/src/core/client/ui/components/index.ts
@@ -1,7 +1,7 @@
 export { default as BaseButton } from "./BaseButton";
 export { default as Button } from "./Button";
 export { default as Typography } from "./Typography";
-export { default as Timestamp } from "./Timestamp";
+export { default as RelativeTime } from "./RelativeTime";
 export { default as UIContext } from "./UIContext";
 export { default as Flex } from "./Flex";
 export { default as MatchMedia } from "./MatchMedia";