diff --git a/controllers/courseware.js b/controllers/courseware.js
index c5efb1cdc4..9c6c1da649 100644
--- a/controllers/courseware.js
+++ b/controllers/courseware.js
@@ -161,7 +161,6 @@ exports.generateChallenge = function(req, res) {
 };
 
 exports.completedCourseware = function (req, res) {
-    debug('In post call with data from req', req);
 
     var isCompletedDate = Math.round(+new Date() / 1000);
     var coursewareHash = req.body.coursewareInfo.coursewareHash;
@@ -182,7 +181,6 @@ exports.completedCourseware = function (req, res) {
             throw err;
         }
         if (user) {
-            debug('Saving user');
             res.send(true)
         }
     });
diff --git a/public/js/lib/bonfire/bonfireFramework.js b/public/js/lib/bonfire/bonfireFramework.js
index 7dcbae9d31..c7487d3f30 100644
--- a/public/js/lib/bonfire/bonfireFramework.js
+++ b/public/js/lib/bonfire/bonfireFramework.js
@@ -114,7 +114,7 @@ $('#submitButton').on('click', function () {
 
 function bonfireExecute() {
     attempts++;
-    ga('send', 'event',  'Bonfire', 'ran-code', bonfireName);
+    ga('send', 'event',  'Bonfire', 'ran-code', challengeName);
     userTests= null;
     $('#codeOutput').empty();
     var userJavaScript = myCodeMirror.getValue();
@@ -239,8 +239,7 @@ var runTests = function(err, data) {
 
 function showCompletion() {
     var time = Math.floor(Date.now() / 1000) - started;
-    console.log(time);
-    ga('send', 'event',  'Bonfire', 'solved', bonfireName + ', Time: ' + time +', Attempts: ' + attempts);
+    ga('send', 'event',  'Challenge', 'solved', challengeName + ', Time: ' + time +', Attempts: ' + attempts);
     $('#complete-bonfire-dialog').modal('show');
     $('#complete-bonfire-dialog').keydown(function(e) {
         if (e.ctrlKey && e.keyCode == 13) {
diff --git a/public/js/lib/coursewares/coursewaresFramework.js b/public/js/lib/coursewares/coursewaresFramework.js
index 0914451d6d..733d8e9fa8 100644
--- a/public/js/lib/coursewares/coursewaresFramework.js
+++ b/public/js/lib/coursewares/coursewaresFramework.js
@@ -43,6 +43,12 @@ var libraryIncludes = "<script src='//ajax.googleapis.com/ajax/libs/jquery/2.1.3
         "<link rel='stylesheet' href='//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css'/>" +
         "<style>body { padding: 0px 3px 0px 3px; }</style>";
 
+var allTests = '';
+(function() {
+    tests.forEach(function(elem) {
+        allTests += elem + ' ';
+    });
+})();
 
 var otherTestsForNow = "<script src='/js/lib/coursewares/iFrameScripts.js'></script>";
 
@@ -112,10 +118,12 @@ function doLinting () {
 
 
 function showCompletion() {
+    var time = Math.floor(Date.now() / 1000) - started;
+    ga('send', 'event',  'Challenge', 'solved', challengeName + ', Time: ' + time);
     $('#complete-courseware-dialog').modal('show');
     $('#complete-courseware-dialog').keydown(function(e) {
         if (e.ctrlKey && e.keyCode == 13) {
             $('.next-courseware-button').click();
         }
     });
-}
\ No newline at end of file
+}
diff --git a/public/js/lib/coursewares/iFrameScripts.js b/public/js/lib/coursewares/iFrameScripts.js
index 32a9c504b9..325b34af69 100644
--- a/public/js/lib/coursewares/iFrameScripts.js
+++ b/public/js/lib/coursewares/iFrameScripts.js
@@ -5,7 +5,6 @@
     try {
         eval(parent.allTests);
     } catch (err) {
-        console.log(err);
         allTestsGood = false;
     } finally {
         if (allTestsGood) {
diff --git a/public/js/main.js b/public/js/main.js
index fb73269169..9b9eea7784 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -1,6 +1,7 @@
 $(document).ready(function() {
-    if (bonfireName) {
-        ga('send', 'event',  'Bonfire', 'load', bonfireName + ':' + Math.floor(Date.now() / 1000));
+    challengeName = challengeName || 'Untitled';
+    if (challengeName) {
+        ga('send', 'event',  'Challenge', 'load', challengeName);
     }
 
     var CSRF_HEADER = 'X-CSRF-Token';
@@ -107,7 +108,7 @@ $(document).ready(function() {
 
     // Bonfire instructions functions
     $('#more-info').on('click', function() {
-        ga('send', 'event',  'Bonfire', 'more-info', bonfireName);
+        ga('send', 'event',  'Challenge', 'more-info', challengeName);
         $('#brief-instructions').hide();
         $('#long-instructions').show().removeClass('hide');
 
diff --git a/views/bonfire/show.jade b/views/bonfire/show.jade
index 086ba767e0..42f8cdce89 100644
--- a/views/bonfire/show.jade
+++ b/views/bonfire/show.jade
@@ -89,7 +89,7 @@ block content
                     var challengeSeed = !{JSON.stringify(challengeSeed)};
                     var challengeEntryPoint = !{JSON.stringify(challengeEntryPoint)};
                     var passedBonfireHash = !{JSON.stringify(bonfireHash)};
-                    var bonfireName = !{JSON.stringify(name)};
+                    var challengeName = !{JSON.stringify(name)};
                     var started = Math.floor(Date.now() / 1000);
         .col-xs-12.col-sm-12.col-md-8
             #mainEditorPanel
diff --git a/views/challenges/show.jade b/views/challenges/show.jade
index 3e20d43033..9de6372f82 100644
--- a/views/challenges/show.jade
+++ b/views/challenges/show.jade
@@ -6,7 +6,7 @@ block content
                 .panel-heading.text-center
                     h1 #{name} (takes #{time} minutes)
                 script.
-                    var bonfireName = null;
+                    var challengeName = null;
                 .panel.panel-body
                     .embed-responsive.embed-responsive-16by9
                         iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}')
diff --git a/views/coursewares/show.jade b/views/coursewares/show.jade
index f1dcc5e011..a842bffacd 100644
--- a/views/coursewares/show.jade
+++ b/views/coursewares/show.jade
@@ -52,7 +52,9 @@ block content
                 var tests = !{JSON.stringify(tests)};
                 var challengeSeed = !{JSON.stringify(challengeSeed)};
                 var passedCoursewareHash = !{JSON.stringify(coursewareHash)};
+                var challengeName = !{JSON.stringify(name)};
                 var prodOrDev = !{JSON.stringify(environment)};
+                var started = Math.floor(Date.now() / 1000);
         .col-xs-12.col-sm-12.col-md-5.col-lg-6
             #mainEditorPanel
                 form.code