diff --git a/buildstatus/inventory.html b/buildstatus/inventory.html
index 4a78271..80a499a 100644
--- a/buildstatus/inventory.html
+++ b/buildstatus/inventory.html
@@ -4,11 +4,10 @@
     <script src="static/js/jquery-2.1.1.min.js"></script>
     <script src="static/js/buildstatus.js"></script>
     <title>Build Status - inventory</title>
-    <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
     <script>
 //TODO (ventris): Currently analytics and buildstatus needs to be on the same host
 // Change the request below to go to an external page instead.
-$.getJSON('/analytics/inventory', function(objects) {
+$.getJSON('/data/inventory', function(objects) {
 
   sorted_keys = Object.keys(objects).sort()
   for(var idx in sorted_keys) {
diff --git a/buildstatus/snmp_errors.html b/buildstatus/snmp_errors.html
index 54f1d75..46f0dd0 100644
--- a/buildstatus/snmp_errors.html
+++ b/buildstatus/snmp_errors.html
@@ -7,7 +7,7 @@
     <script>
 //TODO (ventris): Currently analytics and buildstatus needs to be on the same host
 // Change the request below to go to an external page instead.
-$.getJSON('/analytics/snmp.errors', function(objects) {
+$.getJSON('/data/snmp.errors', function(objects) {
 
   sorted_keys = Object.keys(objects).sort()
   for(var idx in sorted_keys) {
diff --git a/buildstatus/static/js/buildstatus.js b/buildstatus/static/js/buildstatus.js
index f451f55..4b4b237 100644
--- a/buildstatus/static/js/buildstatus.js
+++ b/buildstatus/static/js/buildstatus.js
@@ -265,31 +265,31 @@ function renderStatus() {
 }
 
 function retrieveStatus() {
-  $.getJSON('/analytics/snmp.errors', function(objects) {
+  $.getJSON('/data/snmp.errors', function(objects) {
     snmp_errors = objects;
     updateStatus();
   });
-  $.getJSON('/analytics/snmp.saves', function(objects) {
+  $.getJSON('/data/snmp.saves', function(objects) {
     snmp_saves = objects;
     updateStatus();
   });
-  $.getJSON('/analytics/ping.status', function(objects) {
+  $.getJSON('/data/ping.status', function(objects) {
     ping_status = objects;
     updateStatus();
   });
-  $.getJSON('/analytics/event.hosts', function(objects) {
+  $.getJSON('/data/event.hosts', function(objects) {
     hosts = objects;
     updateStatus();
   });
-  $.getJSON('/analytics/rancid.status', function(objects) {
+  $.getJSON('/data/rancid.status', function(objects) {
     rancid_status = objects;
     updateStatus();
   });
-  $.getJSON('/analytics/syslog.status', function(objects) {
+  $.getJSON('/data/syslog.status', function(objects) {
     syslog_status = objects;
     updateStatus();
   });
-  $.getJSON('/analytics/mon.alerts', function(objects) {
+  $.getJSON('/data/mon.alerts', function(objects) {
     mon_alerts = objects;
     updateStatus();
   });
diff --git a/buildstatus/version.html b/buildstatus/version.html
index 712fa47..a677129 100644
--- a/buildstatus/version.html
+++ b/buildstatus/version.html
@@ -3,12 +3,11 @@
   <head>
     <script src="static/js/jquery-2.1.1.min.js"></script>
     <title>Build Status - version</title>
-    <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
     <script>
 //TODO (ventris): Currently analytics and buildstatus needs to be on the same host
 // Change the request below to go to an external page instead.
-$.getJSON('/analytics/event.hosts', function(hosts) {
-  $.getJSON('/analytics/switch.version', function(objects) {
+$.getJSON('/data/event.hosts', function(hosts) {
+  $.getJSON('/data/switch.version', function(objects) {
     sorted_keys = Object.keys(objects).sort()
     for(var idx in sorted_keys) {
       host = sorted_keys[idx];
