diff --git a/js/app.js b/js/app.js
index dc8204cf..c4645296 100644
--- a/js/app.js
+++ b/js/app.js
@@ -6,9 +6,7 @@ import React from 'react';
 import { Router, Redirect } from 'react-router';
 import history from './history';
 
-/* eslint-disable */
 import fetch from 'isomorphic-fetch';
-/* eslint-enable */
 
 import ApiUrls from './constants/api_urls';
 
@@ -23,15 +21,13 @@ import { getSubdomain } from './utils/general_utils';
 
 import EventActions from './actions/event_actions';
 
-/* eslint-disable */
 // You can comment out the modules you don't need
-// import DebugHandler from './third_party/debug';
-import GoogleAnalyticsHandler from './third_party/ga';
-import RavenHandler from './third_party/raven';
-import IntercomHandler from './third_party/intercom';
-import NotificationsHandler from './third_party/notifications';
-import FacebookHandler from './third_party/facebook';
-/* eslint-enable */
+// import DebugHandler from './third_party/debug_handler';
+import FacebookHandler from './third_party/facebook_handler';
+import GoogleAnalyticsHandler from './third_party/ga_handler';
+import IntercomHandler from './third_party/intercom_handler';
+import NotificationsHandler from './third_party/notifications_handler';
+import RavenHandler from './third_party/raven_handler';
 
 initLogging();
 
@@ -105,4 +101,3 @@ class AppGateway {
 
 let ag = new AppGateway();
 ag.start();
-
diff --git a/js/third_party/debug.js b/js/third_party/debug_handler.js
similarity index 99%
rename from js/third_party/debug.js
rename to js/third_party/debug_handler.js
index 23fe4d04..cd11bf72 100644
--- a/js/third_party/debug.js
+++ b/js/third_party/debug_handler.js
@@ -4,7 +4,6 @@ import { altThirdParty } from '../alt';
 import EventActions from '../actions/event_actions';
 
 
-
 class DebugHandler {
     constructor() {
         let symbols = [];
diff --git a/js/third_party/facebook.js b/js/third_party/facebook_handler.js
similarity index 100%
rename from js/third_party/facebook.js
rename to js/third_party/facebook_handler.js
diff --git a/js/third_party/ga.js b/js/third_party/ga_handler.js
similarity index 100%
rename from js/third_party/ga.js
rename to js/third_party/ga_handler.js
diff --git a/js/third_party/intercom.js b/js/third_party/intercom_handler.js
similarity index 100%
rename from js/third_party/intercom.js
rename to js/third_party/intercom_handler.js
diff --git a/js/third_party/notifications.js b/js/third_party/notifications_handler.js
similarity index 100%
rename from js/third_party/notifications.js
rename to js/third_party/notifications_handler.js
diff --git a/js/third_party/raven.js b/js/third_party/raven_handler.js
similarity index 100%
rename from js/third_party/raven.js
rename to js/third_party/raven_handler.js