diff --git a/src/short-urls/ShortUrlsList.js b/src/short-urls/ShortUrlsList.js
index 31263dec..a6b9dd38 100644
--- a/src/short-urls/ShortUrlsList.js
+++ b/src/short-urls/ShortUrlsList.js
@@ -5,7 +5,7 @@ import { isEmpty } from 'ramda';
 import React from 'react';
 import { connect } from 'react-redux';
 import Tag from '../utils/Tag';
-import { Row } from './helpers/ShortUrlsRow';
+import { ShortUrlsRow } from './helpers/ShortUrlsRow';
 import { listShortUrls } from './reducers/shortUrlsList';
 import './ShortUrlsList.scss';
 
@@ -109,7 +109,7 @@ export class ShortUrlsList extends React.Component {
     }
 
     return shortUrlsList.map(shortUrl => (
-      <Row shortUrl={shortUrl} selectedServer={selectedServer} key={shortUrl.shortCode} />
+      <ShortUrlsRow shortUrl={shortUrl} selectedServer={selectedServer} key={shortUrl.shortCode} />
     ));
   }
 
diff --git a/src/short-urls/helpers/ShortUrlsRow.js b/src/short-urls/helpers/ShortUrlsRow.js
index 67aadd84..9bdfad9a 100644
--- a/src/short-urls/helpers/ShortUrlsRow.js
+++ b/src/short-urls/helpers/ShortUrlsRow.js
@@ -1,10 +1,10 @@
 import React from 'react';
 import Moment from 'react-moment';
 import { ShortUrlsList } from '../ShortUrlsList';
-import { RowMenu } from './ShortUrlsRowMenu';
+import { ShortUrlsRowMenu } from './ShortUrlsRowMenu';
 import './ShortUrlsRow.scss'
 
-export class Row extends React.Component {
+export class ShortUrlsRow extends React.Component {
   state = {displayMenu: false, copiedToClipboard: false};
 
   render() {
@@ -17,7 +17,7 @@ export class Row extends React.Component {
         onMouseLeave={() => this.setState({displayMenu: false})}
       >
         <td className="nowrap short-urls-row__cell">
-          <Moment format="YYYY-MM-DD HH:mm" interval={0}>{shortUrl.dateCreated}</Moment>
+          <Moment format="YYYY-MM-DD HH:mm">{shortUrl.dateCreated}</Moment>
         </td>
         <td className="short-urls-row__cell">
           <a href={completeShortUrl} target="_blank">{completeShortUrl}</a>
@@ -34,7 +34,7 @@ export class Row extends React.Component {
         <td className="short-urls-row__cell">{ShortUrlsList.renderTags(shortUrl.tags)}</td>
         <td className="short-urls-row__cell text-right">{shortUrl.visitsCount}</td>
         <td className="short-urls-row__cell">
-          <RowMenu
+          <ShortUrlsRowMenu
             display={this.state.displayMenu}
             shortUrl={completeShortUrl}
             onCopyToClipboard={() => {
diff --git a/src/short-urls/helpers/ShortUrlsRowMenu.js b/src/short-urls/helpers/ShortUrlsRowMenu.js
index e5e45f1b..d3c04148 100644
--- a/src/short-urls/helpers/ShortUrlsRowMenu.js
+++ b/src/short-urls/helpers/ShortUrlsRowMenu.js
@@ -11,7 +11,7 @@ import PreviewModal from './PreviewModal';
 import QrCodeModal from './QrCodeModal';
 import './ShortUrlsRowMenu.scss';
 
-export class RowMenu extends React.Component {
+export class ShortUrlsRowMenu extends React.Component {
   state = { isOpen: false, isQrModalOpen: false, isPreviewOpen: false };
   toggle = () => this.setState({ isOpen: !this.state.isOpen });