diff --git a/public/js/app.jsx b/public/js/app.jsx
index 2efae9b702..72b21835a6 100644
--- a/public/js/app.jsx
+++ b/public/js/app.jsx
@@ -1,7 +1,7 @@
 var React                   = require('react');
 var TabView                 = require('./components/TabView');
 var Menu                    = require('./components/Menu');
-var EventsComponent         = React.createFactory(require('./components/event/EventsComponent'));
+var LogEntriesComponent         = React.createFactory(require('./components/log/LogEntriesComponent'));
 var FeatureTogglesComponent = React.createFactory(require('./components/feature/FeatureTogglesComponent'));
 var StrategiesComponent     = React.createFactory(require('./components/strategy/StrategiesComponent'));
 
@@ -17,7 +17,7 @@ var tabPanes = [
     },
     {
         name: "Log",
-        content: new EventsComponent({})
+        content: new LogEntriesComponent({})
     }
 ];
 
diff --git a/public/js/components/event/EventsComponent.jsx b/public/js/components/log/LogEntriesComponent.jsx
similarity index 84%
rename from public/js/components/event/EventsComponent.jsx
rename to public/js/components/log/LogEntriesComponent.jsx
index 08e996cd16..45a943d7f6 100644
--- a/public/js/components/event/EventsComponent.jsx
+++ b/public/js/components/log/LogEntriesComponent.jsx
@@ -1,9 +1,9 @@
 var React          = require('react'),
-    EventList   = require('./EventList'),
+    LogEntryList   = require('./LogEntryList'),
     eventStore  = require('../../stores/EventStore'),
     ErrorMessages  = require('../ErrorMessages');
 
-var EventsComponent = React.createClass({
+var LogEntriesComponent = React.createClass({
     getInitialState: function() {
         return {
             createView: false,
@@ -38,10 +38,10 @@ var EventsComponent = React.createClass({
 
                 <hr />
 
-                <EventList events={this.state.events} />
+                <LogEntryList events={this.state.events} />
             </div>
             );
     },
 });
 
-module.exports = EventsComponent;
\ No newline at end of file
+module.exports = LogEntriesComponent;
\ No newline at end of file
diff --git a/public/js/components/event/Event.jsx b/public/js/components/log/LogEntry.jsx
similarity index 85%
rename from public/js/components/event/Event.jsx
rename to public/js/components/log/LogEntry.jsx
index b513da52ba..b60e4d26ca 100644
--- a/public/js/components/event/Event.jsx
+++ b/public/js/components/log/LogEntry.jsx
@@ -1,6 +1,6 @@
 var React = require('react');
 
-var Event = React.createClass({
+var LogEntry = React.createClass({
     propTypes: {
         event: React.PropTypes.object.isRequired
     },
@@ -16,4 +16,4 @@ var Event = React.createClass({
     }
 });
 
-module.exports = Event;
\ No newline at end of file
+module.exports = LogEntry;
\ No newline at end of file
diff --git a/public/js/components/event/EventList.jsx b/public/js/components/log/LogEntryList.jsx
similarity index 69%
rename from public/js/components/event/EventList.jsx
rename to public/js/components/log/LogEntryList.jsx
index 670ac67979..76c4d464b5 100644
--- a/public/js/components/event/EventList.jsx
+++ b/public/js/components/log/LogEntryList.jsx
@@ -1,14 +1,14 @@
 var React = require('react'),
-    Event = require('./Event');
+    LogEntry = require('./LogEntry');
 
-var EventList = React.createClass({
+var LogEntryList = React.createClass({
     propTypes: {
         events: React.PropTypes.array.isRequired
     },
 
     render: function() {
-        var eventNodes = this.props.events.map(function(event) {
-            return <Event event={event} key={event.name} />;
+        var logEntryNodes = this.props.events.map(function(event) {
+            return <LogEntry event={event} key={event.name} />;
         });
         return (
             <div className='r-margin'>
@@ -21,7 +21,7 @@ var EventList = React.createClass({
                         </tr>
                     </thead>
                     <tbody>
-                        {eventNodes}
+                        {logEntryNodes}
                     </tbody>
                 </table>
             </div>
@@ -29,4 +29,4 @@ var EventList = React.createClass({
     }
 });
 
-module.exports = EventList;
\ No newline at end of file
+module.exports = LogEntryList;
\ No newline at end of file