diff --git a/spec/stdlib/underscore-extensions-spec.coffee b/spec/stdlib/underscore-extensions-spec.coffee
index 50dbca158..454395573 100644
--- a/spec/stdlib/underscore-extensions-spec.coffee
+++ b/spec/stdlib/underscore-extensions-spec.coffee
@@ -65,3 +65,14 @@ describe "underscore extensions", ->
         array = ['a', 'b', 'c']
         _.spliceWithArray(array, 1, 1, ['v', 'w', 'x', 'y', 'z'], 2)
         expect(array).toEqual ['a', 'v', 'w', 'x', 'y', 'z', 'c']
+
+  describe "_.humanizeEventName(eventName)", ->
+    describe "when no namespace exists", ->
+      it "undasherizes and capitalizes the event name", ->
+        expect(_.humanizeEventName('nonamespace')).toBe 'Nonamespace'
+        expect(_.humanizeEventName('no-name-space')).toBe 'No Name Space'
+
+    describe "when a namespaces exists", ->
+      it "space separates the undasherized/capitalized versions of the namespace and event name", ->
+        expect(_.humanizeEventName('space:final-frontier')).toBe 'Space: Final Frontier'
+        expect(_.humanizeEventName('star-trek:the-next-generation')).toBe 'Star Trek: The Next Generation'
diff --git a/src/stdlib/underscore-extensions.coffee b/src/stdlib/underscore-extensions.coffee
index d89bc99b7..6f71705d5 100644
--- a/src/stdlib/underscore-extensions.coffee
+++ b/src/stdlib/underscore-extensions.coffee
@@ -62,7 +62,7 @@ _.mixin
 
   humanizeEventName: (eventName, eventDoc) ->
     [namespace, event]  = eventName.split(':')
-    return _.capitalize(namespace) unless event?
+    return _.undasherize(namespace) unless event?
 
     namespaceDoc = _.undasherize(namespace)
     eventDoc ?= _.undasherize(event)