diff --git a/packages/component-manuscript/src/components/ManuscriptHeader.js b/packages/component-manuscript/src/components/ManuscriptHeader.js
index fbd15b63a91b4583f533ed8f62d2e8049e734de5..caa38eb70f31265b39428a8227d36c032f68fd46 100644
--- a/packages/component-manuscript/src/components/ManuscriptHeader.js
+++ b/packages/component-manuscript/src/components/ManuscriptHeader.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import { get } from 'lodash'
-import { Date } from 'pubsweet-components-faraday/src/components'
+import { DateParser } from 'pubsweet-components-faraday/src/components'
 // import { AuthorsWithTooltip } from '@pubsweet/ui'
 
 import {
@@ -30,13 +30,13 @@ const ManuscriptDetails = ({ version, project, journal }) => {
       <Row>
         <LeftDetails flex={3}>
           <StatusLabel>{mapStatusToLabel(project)}</StatusLabel>
-          <Date timestamp={get(version, 'submitted')}>
+          <DateParser timestamp={get(version, 'submitted')}>
             {(timestamp, days) => (
               <DateField>
                 {timestamp} ({days})
               </DateField>
             )}
-          </Date>
+          </DateParser>
         </LeftDetails>
         <RightDetails flex={4}>
           <ManuscriptType title={manuscriptMeta}>
diff --git a/packages/component-manuscript/src/components/ReviewReportCard.js b/packages/component-manuscript/src/components/ReviewReportCard.js
index 1458635b44294d9405e27809da4fdba259720eb4..ff357bec2509e18d1a2d164f1f8a26945ec0f8cf 100644
--- a/packages/component-manuscript/src/components/ReviewReportCard.js
+++ b/packages/component-manuscript/src/components/ReviewReportCard.js
@@ -4,7 +4,7 @@ import { compose } from 'recompose'
 import { get, isEmpty } from 'lodash'
 import { withJournal } from 'xpub-journal'
 import styled, { css } from 'styled-components'
-import { Date } from 'pubsweet-components-faraday/src/components'
+import { DateParser } from 'pubsweet-components-faraday/src/components'
 import { FileItem } from 'pubsweet-components-faraday/src/components/Files'
 
 import { ShowMore } from './'
@@ -32,17 +32,17 @@ const ReviewReportCard = ({
             <Underline>{user.name}</Underline>
             <span>{user.email}</span>
           </Text>
-          <Date timestamp={submittedOn}>
+          <DateParser timestamp={submittedOn}>
             {timestamp => <Text>{timestamp}</Text>}
-          </Date>
+          </DateParser>
         </Row>
       )}
       <Row>
         <Label>Recommendation</Label>
         {!hasReviewer && (
-          <Date timestamp={submittedOn}>
+          <DateParser timestamp={submittedOn}>
             {timestamp => <Text>{timestamp}</Text>}
-          </Date>
+          </DateParser>
         )}
       </Row>
       <Row>
diff --git a/packages/components-faraday/src/components/Dashboard/DashboardCard.js b/packages/components-faraday/src/components/Dashboard/DashboardCard.js
index 70d39adfda90d14ef1f20072630cb6e67ad0f8e9..9e724a3c4624993f87734b9ac8f12cb221b550cb 100644
--- a/packages/components-faraday/src/components/Dashboard/DashboardCard.js
+++ b/packages/components-faraday/src/components/Dashboard/DashboardCard.js
@@ -9,7 +9,7 @@ import {
   withModal,
   ConfirmationModal,
 } from 'pubsweet-component-modal/src/components'
-import { Date } from 'pubsweet-components-faraday/src/components'
+import { DateParser } from 'pubsweet-components-faraday/src/components'
 import { AuthorsWithTooltip } from 'pubsweet-component-manuscript/src/molecules'
 // import { AuthorsWithTooltip } from '@pubsweet/ui'
 
@@ -96,13 +96,13 @@ const DashboardCard = ({
         <Bottom>
           <LeftDetails flex={3}>
             <Status>{mapStatusToLabel(project)}</Status>
-            <Date timestamp={get(version, 'submitted')}>
+            <DateParser timestamp={get(version, 'submitted')}>
               {(timestamp, daysAgo) => (
                 <DateField>
                   {timestamp} ({daysAgo})
                 </DateField>
               )}
-            </Date>
+            </DateParser>
           </LeftDetails>
           <RightDetails flex={4}>
             <ManuscriptType title={manuscriptMeta}>
diff --git a/packages/components-faraday/src/components/Reviewers/ReviewerList.js b/packages/components-faraday/src/components/Reviewers/ReviewerList.js
index 1d270cfe14d3b121e190777861a5377be2482b68..5acbf18c452cd2c26371dec8d12fc88f566f7df0 100644
--- a/packages/components-faraday/src/components/Reviewers/ReviewerList.js
+++ b/packages/components-faraday/src/components/Reviewers/ReviewerList.js
@@ -4,7 +4,7 @@ import { connect } from 'react-redux'
 import styled from 'styled-components'
 import { th, Icon } from '@pubsweet/ui'
 import { compose, withHandlers, withProps } from 'recompose'
-import { Date } from 'pubsweet-components-faraday/src/components'
+import { DateParser } from 'pubsweet-components-faraday/src/components'
 
 import { revokeReviewer, inviteReviewer } from '../../redux/reviewers'
 
@@ -47,9 +47,9 @@ const ReviewersList = ({
               <StatusText>
                 {r.status === 'accepted' ? 'Agreed' : r.status}
               </StatusText>
-              <Date timestamp={r.respondedOn}>
+              <DateParser timestamp={r.respondedOn}>
                 {timestamp => <DateText>{timestamp}</DateText>}
-              </Date>
+              </DateParser>
             </Column>
             {r.status === 'pending' ? (
               <ResendRevoke
diff --git a/packages/components-faraday/src/components/Reviewers/ReviewersDetailsList.js b/packages/components-faraday/src/components/Reviewers/ReviewersDetailsList.js
index 6d3573dd30530e238e908ed282c0452019d6bbf8..f8aa95193d404f97af140ab230234cd0508ab7bc 100644
--- a/packages/components-faraday/src/components/Reviewers/ReviewersDetailsList.js
+++ b/packages/components-faraday/src/components/Reviewers/ReviewersDetailsList.js
@@ -4,7 +4,7 @@ import { connect } from 'react-redux'
 import { th, Icon } from '@pubsweet/ui'
 import styled, { css } from 'styled-components'
 import { compose, withHandlers, withProps } from 'recompose'
-import { Date } from 'pubsweet-components-faraday/src/components'
+import { DateParser } from 'pubsweet-components-faraday/src/components'
 import {
   withModal2,
   ConfirmationModal,
@@ -47,16 +47,20 @@ const TR = ({
           <AcceptedReviewer>{renderAcceptedLabel(index)}</AcceptedReviewer>
         )}
       </td>
-      <Date timestamp={r.invitedOn}>{timestamp => <td>{timestamp}</td>}</Date>
+      <DateParser timestamp={r.invitedOn}>
+        {timestamp => <td>{timestamp}</td>}
+      </DateParser>
       <td>
         <StatusText>
           {`${r.status === 'accepted' ? 'Agreed: ' : r.status}`}
         </StatusText>
-        <Date timestamp={r.respondedOn}>
+        <DateParser timestamp={r.respondedOn}>
           {timestamp => <DateText>{timestamp}</DateText>}
-        </Date>
+        </DateParser>
       </td>
-      <Date timestamp={submittedOn}>{timestamp => <td>{timestamp}</td>}</Date>
+      <DateParser timestamp={submittedOn}>
+        {timestamp => <td>{timestamp}</td>}
+      </DateParser>
       <td width={100}>
         {r.status === 'pending' && (
           <ResendRevoke
diff --git a/packages/components-faraday/src/components/UIComponents/Date.js b/packages/components-faraday/src/components/UIComponents/DateParser.js
similarity index 89%
rename from packages/components-faraday/src/components/UIComponents/Date.js
rename to packages/components-faraday/src/components/UIComponents/DateParser.js
index cb3ea3577f6ffe9c8f12aa44b898f10d3900dfaf..5ff1623f3983cb4b2d603f21c6eac96d15139be2 100644
--- a/packages/components-faraday/src/components/UIComponents/Date.js
+++ b/packages/components-faraday/src/components/UIComponents/DateParser.js
@@ -7,7 +7,8 @@ const getDuration = timestamp => {
   return moment.duration(today.diff(stamp))
 }
 
-const Date = ({ children, timestamp, daysAgo }) => children(timestamp, daysAgo)
+const DateParser = ({ children, timestamp, daysAgo }) =>
+  children(timestamp, daysAgo)
 
 export default compose(
   withHandlers({
@@ -30,4 +31,4 @@ export default compose(
     daysAgo: renderDaysAgo(),
     timestamp: renderTimestamp(),
   })),
-)(Date)
+)(DateParser)
diff --git a/packages/components-faraday/src/components/UIComponents/index.js b/packages/components-faraday/src/components/UIComponents/index.js
index e8b4ba57e357f58fe900772ce00a786618c06f3c..7ccd5732e09478b2c6463473098039f151a19754 100644
--- a/packages/components-faraday/src/components/UIComponents/index.js
+++ b/packages/components-faraday/src/components/UIComponents/index.js
@@ -1,9 +1,9 @@
 import * as FormItems from './FormItems'
 
 export { FormItems }
-export { default as Date } from './Date'
 export { default as Logo } from './Logo'
 export { default as Spinner } from './Spinner'
 export { default as NotFound } from './NotFound'
 export { default as ErrorPage } from './ErrorPage'
+export { default as DateParser } from './DateParser'
 export { default as ConfirmationPage } from './ConfirmationPage'
diff --git a/packages/components-faraday/src/components/index.js b/packages/components-faraday/src/components/index.js
index 0b81850249bd69c3249612a92511340fc667abbd..e01e94e3415c4e7fed83e86b12a50c338c112c04 100644
--- a/packages/components-faraday/src/components/index.js
+++ b/packages/components-faraday/src/components/index.js
@@ -5,4 +5,4 @@ export { default as AuthorList } from './AuthorList/AuthorList'
 export { default as SortableList } from './SortableList/SortableList'
 
 export { DragHandle } from './AuthorList/FormItems'
-export { Dropdown, Date, Logo, Spinner } from './UIComponents'
+export { Dropdown, DateParser, Logo, Spinner } from './UIComponents'
diff --git a/yarn.lock b/yarn.lock
index 064c05a50e2162612bbcf6b43530bb1b9cd65cf0..e7ef3dd275a5a26082990e2613a37d13fa89e5d9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6259,6 +6259,10 @@ moment@2.x.x, moment@^2.18.1, moment@^2.20.1, moment@^2.6.0:
   version "2.20.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
 
+moment@^2.22.1:
+  version "2.22.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
+
 morgan@^1.8.2:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.0.tgz#d01fa6c65859b76fcf31b3cb53a3821a311d8051"