diff --git a/src/Journal.tsx b/src/Journal.tsx
index b35060d..cef401b 100644
--- a/src/Journal.tsx
+++ b/src/Journal.tsx
@@ -6,8 +6,8 @@ import { Tabs, Tab } from 'material-ui/Tabs';
 import * as EteSync from './api/EteSync';
 
 import JournalEntries from './JournalEntries';
-import AddressBook from './AddressBook';
-import Calendar from './Calendar';
+import JournalAddressBook from './JournalAddressBook';
+import JournalCalendar from './JournalCalendar';
 import LoadingIndicator from './LoadingIndicator';
 
 import { store, StoreState, JournalsData, EntriesType, CredentialsData, fetchEntries } from './store';
@@ -68,10 +68,10 @@ class Journal extends React.Component {
     let itemsTitle: string;
     let itemsView: JSX.Element;
     if (collectionInfo.type === 'CALENDAR') {
-      itemsView = <Calendar journal={journal} entries={syncEntries} />;
+      itemsView = <JournalCalendar journal={journal} entries={syncEntries} />;
       itemsTitle = 'Events';
     } else if (collectionInfo.type === 'ADDRESS_BOOK') {
-      itemsView = <AddressBook journal={journal} entries={syncEntries} />;
+      itemsView = <JournalAddressBook journal={journal} entries={syncEntries} />;
       itemsTitle = 'Contacts';
     } else {
       itemsView = <div>Unsupported type</div>;
diff --git a/src/AddressBook.tsx b/src/JournalAddressBook.tsx
similarity index 96%
rename from src/AddressBook.tsx
rename to src/JournalAddressBook.tsx
index a16ff1f..9e2587b 100644
--- a/src/AddressBook.tsx
+++ b/src/JournalAddressBook.tsx
@@ -10,7 +10,7 @@ import * as EteSync from './api/EteSync';
 import { routeResolver } from './App';
 import Contact from './Contact';
 
-class AddressBook extends React.Component {
+class JournalAddressBook extends React.Component {
   static defaultProps = {
     prevUid: null,
   };
@@ -95,4 +95,4 @@ class AddressBook extends React.Component {
   }
 }
 
-export default AddressBook;
+export default JournalAddressBook;
diff --git a/src/Calendar.tsx b/src/JournalCalendar.tsx
similarity index 96%
rename from src/Calendar.tsx
rename to src/JournalCalendar.tsx
index 22711a2..caae320 100644
--- a/src/Calendar.tsx
+++ b/src/JournalCalendar.tsx
@@ -33,7 +33,7 @@ class EventWrapper {
   }
 }
 
-class Calendar extends React.Component {
+class JournalCalendar extends React.Component {
   static defaultProps = {
     prevUid: null,
   };
@@ -101,4 +101,4 @@ class Calendar extends React.Component {
   }
 }
 
-export default Calendar;
+export default JournalCalendar;