diff --git a/lib/console/console.js b/lib/console/console.js
index eccd6062..c00897f0 100644
--- a/lib/console/console.js
+++ b/lib/console/console.js
@@ -119,7 +119,7 @@ getJasmineRequireObj().ConsoleReporter = function() {
       }
     };
 
-    this.afterAllException = function(error) {
+    this.afterAllError = function(error) {
       exceptionList.push(error);
     };
 
diff --git a/spec/console/ConsoleReporterSpec.js b/spec/console/ConsoleReporterSpec.js
index 86204fd2..2c1af8c1 100644
--- a/spec/console/ConsoleReporterSpec.js
+++ b/spec/console/ConsoleReporterSpec.js
@@ -229,10 +229,10 @@ describe("ConsoleReporter", function() {
           error = new Error('After All Exception'),
           anotherError = new Error('Some Other Exception');
 
-        reporter.afterAllException(error);
-        reporter.afterAllException(anotherError);
+        reporter.afterAllError(error);
+        reporter.afterAllError(anotherError);
         reporter.jasmineDone();
-        
+
         expect(out.getOutput()).toMatch(/After All Exception/);
         expect(out.getOutput()).toMatch(/Some Other Exception/);
     });
diff --git a/spec/core/integration/EnvSpec.js b/spec/core/integration/EnvSpec.js
index 9da4dd97..7b782c41 100644
--- a/spec/core/integration/EnvSpec.js
+++ b/spec/core/integration/EnvSpec.js
@@ -331,11 +331,11 @@ describe("Env integration", function() {
   it("reports when afterAll throws an exception", function(done) {
     var env = new j$.Env(),
       error = new Error('After All Exception'),
-      reporter = jasmine.createSpyObj('fakeReport', ['jasmineDone','afterAllException']);
+      reporter = jasmine.createSpyObj('fakeReport', ['jasmineDone','afterAllError']);
 
 
     reporter.jasmineDone.and.callFake(function() {
-      expect(reporter.afterAllException).toHaveBeenCalledWith(error);
+      expect(reporter.afterAllError).toHaveBeenCalledWith(error);
       done();
     });
 
@@ -356,11 +356,11 @@ describe("Env integration", function() {
   it("reports when an async afterAll throws an exception", function(done) {
     var env = new j$.Env(),
       error = new Error('After All Exception'),
-      reporter = jasmine.createSpyObj('fakeReport', ['jasmineDone','afterAllException']);
+      reporter = jasmine.createSpyObj('fakeReport', ['jasmineDone','afterAllError']);
 
 
     reporter.jasmineDone.and.callFake(function() {
-      expect(reporter.afterAllException).toHaveBeenCalledWith(error);
+      expect(reporter.afterAllError).toHaveBeenCalled();
       done();
     });
 
@@ -370,7 +370,7 @@ describe("Env integration", function() {
       env.it('my spec', function() {
       });
 
-      env.afterAll(function(done) {
+      env.afterAll(function(afterAllDone) {
         throw error;
       });
     });
diff --git a/spec/html/HtmlReporterSpec.js b/spec/html/HtmlReporterSpec.js
index 20eb24d9..87cd80f0 100644
--- a/spec/html/HtmlReporterSpec.js
+++ b/spec/html/HtmlReporterSpec.js
@@ -130,7 +130,7 @@ describe("New HtmlReporter", function() {
     });
   });
 
-  describe("when there are afterAllExceptions", function () {
+  describe("when there are afterAllErrors", function () {
     it("displays the exceptions in their own alert bars", function(){
       var env = new j$.Env(),
         container = document.createElement("div"),
@@ -147,8 +147,8 @@ describe("New HtmlReporter", function() {
       reporter.initialize();
 
       reporter.jasmineStarted({});
-      reporter.afterAllException(error);
-      reporter.afterAllException(otherError);
+      reporter.afterAllError(error);
+      reporter.afterAllError(otherError);
       reporter.jasmineDone({});
 
       var alertBars = container.querySelectorAll(".alert .bar");
diff --git a/src/console/ConsoleReporter.js b/src/console/ConsoleReporter.js
index bfd15273..b40b86d5 100644
--- a/src/console/ConsoleReporter.js
+++ b/src/console/ConsoleReporter.js
@@ -84,7 +84,7 @@ getJasmineRequireObj().ConsoleReporter = function() {
       }
     };
 
-    this.afterAllException = function(error) {
+    this.afterAllError = function(error) {
       exceptionList.push(error);
     };
 
diff --git a/src/core/Env.js b/src/core/Env.js
index 40631b7b..e8174694 100644
--- a/src/core/Env.js
+++ b/src/core/Env.js
@@ -35,7 +35,7 @@ getJasmineRequireObj().Env = function(j$) {
       'suiteDone',
       'specStarted',
       'specDone',
-      'afterAllException'
+      'afterAllError'
     ]);
 
     this.specFilter = function() {
diff --git a/src/core/QueueRunner.js b/src/core/QueueRunner.js
index 726591f4..cc3ece1a 100644
--- a/src/core/QueueRunner.js
+++ b/src/core/QueueRunner.js
@@ -51,7 +51,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
         queueableFn.fn.call(self.userContext);
       } catch (e) {
         if(queueableFn.isAfterAll){
-          runner.reporter.afterAllException(e);
+          runner.reporter.afterAllError(e);
         }
         handleException(e);
       }
@@ -78,7 +78,7 @@ getJasmineRequireObj().QueueRunner = function(j$) {
         queueableFn.fn.call(self.userContext, next);
       } catch (e) {
         if(queueableFn.isAfterAll) {
-          runner.reporter.afterAllException(e);
+          runner.reporter.afterAllError(e);
         }
         handleException(e);
         next();
diff --git a/src/html/HtmlReporter.js b/src/html/HtmlReporter.js
index effa58bd..7ef6fb67 100644
--- a/src/html/HtmlReporter.js
+++ b/src/html/HtmlReporter.js
@@ -65,7 +65,7 @@ jasmineRequire.HtmlReporter = function(j$) {
       currentParent.addChild(result, 'spec');
     };
 
-    this.afterAllException = function(error) {
+    this.afterAllError = function(error) {
       exceptionList.push(error);
     };