diff --git a/src/atom-package.coffee b/src/atom-package.coffee
index eb2958ba0..061f203d7 100644
--- a/src/atom-package.coffee
+++ b/src/atom-package.coffee
@@ -163,7 +163,7 @@ class AtomPackage extends Package
     @deactivateResources()
     @deactivateConfig()
     @mainModule?.deactivate?() if @mainActivated
-    @trigger('deactivated')
+    @emit('deactivated')
 
   deactivateConfig: ->
     @mainModule?.deactivateConfig?()
diff --git a/src/config.coffee b/src/config.coffee
index d886b6304..d82131de0 100644
--- a/src/config.coffee
+++ b/src/config.coffee
@@ -88,7 +88,7 @@ class Config
       userConfig = CSON.readFileSync(@configFilePath)
       _.extend(@settings, userConfig)
       @configFileHasErrors = false
-      @trigger 'updated'
+      @emit 'updated'
     catch e
       @configFileHasErrors = true
       console.error "Failed to load user config '#{@configFilePath}'", e.message
@@ -219,7 +219,7 @@ class Config
   update: ->
     return if @configFileHasErrors
     @save()
-    @trigger 'updated'
+    @emit 'updated'
 
   # Private:
   save: ->
diff --git a/src/cursor.coffee b/src/cursor.coffee
index fc4fbb5a9..878816226 100644
--- a/src/cursor.coffee
+++ b/src/cursor.coffee
@@ -36,12 +36,12 @@ class Cursor
         newScreenPosition: newHeadScreenPosition
         textChanged: textChanged
 
-      @trigger 'moved', movedEvent
-      @editSession.trigger 'cursor-moved', movedEvent
+      @emit 'moved', movedEvent
+      @editSession.emit 'cursor-moved', movedEvent
     @marker.on 'destroyed', =>
       @destroyed = true
       @editSession.removeCursor(this)
-      @trigger 'destroyed'
+      @emit 'destroyed'
     @needsAutoscroll = true
 
   # Private:
@@ -54,7 +54,7 @@ class Cursor
     @clearSelection()
     @needsAutoscroll = options.autoscroll ? @isLastCursor()
     unless fn()
-      @trigger 'autoscrolled' if @needsAutoscroll
+      @emit 'autoscrolled' if @needsAutoscroll
 
   # Public: Moves a cursor to a given screen position.
   #
@@ -97,7 +97,7 @@ class Cursor
     if @visible != visible
       @visible = visible
       @needsAutoscroll ?= true if @visible and @isLastCursor()
-      @trigger 'visibility-changed', @visible
+      @emit 'visibility-changed', @visible
 
   # Public: Returns the visibility of the cursor.
   isVisible: -> @visible
diff --git a/src/directory.coffee b/src/directory.coffee
index db099c951..491a0cdda 100644
--- a/src/directory.coffee
+++ b/src/directory.coffee
@@ -101,7 +101,7 @@ class Directory
   # Private:
   subscribeToNativeChangeEvents: ->
     @watchSubscription = pathWatcher.watch @path, (eventType) =>
-      @trigger "contents-changed" if eventType is "change"
+      @emit "contents-changed" if eventType is "change"
 
   # Private:
   unsubscribeFromNativeChangeEvents: ->
diff --git a/src/display-buffer-marker.coffee b/src/display-buffer-marker.coffee
index 56a4db010..ca244759b 100644
--- a/src/display-buffer-marker.coffee
+++ b/src/display-buffer-marker.coffee
@@ -1,7 +1,6 @@
 {Range} = require 'telepath'
 _ = require './underscore-extensions'
-{EventEmitter} = require 'emissary'
-{Subscriber} = require 'emissary'
+{EventEmitter, Subscriber} = require 'emissary'
 
 # Private:
 module.exports =
@@ -184,7 +183,7 @@ class DisplayBufferMarker
 
   destroyed: ->
     delete @displayBuffer.markers[@id]
-    @trigger 'destroyed'
+    @emit 'destroyed'
 
   notifyObservers: ({textChanged}) ->
     textChanged ?= false
@@ -203,7 +202,7 @@ class DisplayBufferMarker
     changed = true unless _.isEqual(isValid, @wasValid)
     return unless changed
 
-    @trigger 'changed', {
+    @emit 'changed', {
       @oldHeadScreenPosition, newHeadScreenPosition,
       @oldTailScreenPosition, newTailScreenPosition,
       @oldHeadBufferPosition, newHeadBufferPosition,
diff --git a/src/display-buffer.coffee b/src/display-buffer.coffee
index 0449fba48..606e64b41 100644
--- a/src/display-buffer.coffee
+++ b/src/display-buffer.coffee
@@ -1,14 +1,13 @@
 _ = require './underscore-extensions'
+{EventEmitter, Subscriber} = require 'emissary'
 guid = require 'guid'
 telepath = require 'telepath'
 {Point, Range} = telepath
 TokenizedBuffer = require './tokenized-buffer'
 RowMap = require './row-map'
-{EventEmitter} = require 'emissary'
 Fold = require './fold'
 Token = require './token'
 DisplayBufferMarker = require './display-buffer-marker'
-{Subscriber} = require 'emissary'
 ConfigObserver = require './config-observer'
 
 # Private:
@@ -46,7 +45,7 @@ class DisplayBuffer
     @foldsByMarkerId = {}
     @updateAllScreenLines()
     @createFoldForMarker(marker) for marker in @buffer.findMarkers(@getFoldMarkerAttributes())
-    @subscribe @tokenizedBuffer, 'grammar-changed', (grammar) => @trigger 'grammar-changed', grammar
+    @subscribe @tokenizedBuffer, 'grammar-changed', (grammar) => @emit 'grammar-changed', grammar
     @subscribe @tokenizedBuffer, 'changed', @handleTokenizedBufferChange
     @subscribe @buffer, 'markers-updated', @handleBufferMarkersUpdated
     @subscribe @buffer, 'marker-created', @handleBufferMarkerCreated
@@ -54,7 +53,7 @@ class DisplayBuffer
     @subscribe @state, 'changed', ({key, newValue}) =>
       switch key
         when 'softWrap'
-          @trigger 'soft-wrap-changed', newValue
+          @emit 'soft-wrap-changed', newValue
           @updateWrappedScreenLines()
 
     @observeConfig 'editor.preferredLineLength', callNow: false, =>
@@ -78,11 +77,11 @@ class DisplayBuffer
     @rowMap = new RowMap
     @updateScreenLines(0, @buffer.getLineCount(), null, suppressChangeEvent: true)
 
-  triggerChanged: (eventProperties, refreshMarkers=true) ->
+  emitChanged: (eventProperties, refreshMarkers=true) ->
     if refreshMarkers
       @pauseMarkerObservers()
       @refreshMarkerScreenPositions()
-    @trigger 'changed', eventProperties
+    @emit 'changed', eventProperties
     @resumeMarkerObservers()
 
   updateWrappedScreenLines: ->
@@ -91,7 +90,7 @@ class DisplayBuffer
     @updateAllScreenLines()
     screenDelta = @getLastRow() - end
     bufferDelta = 0
-    @triggerChanged({ start, end, screenDelta, bufferDelta })
+    @emitChanged({ start, end, screenDelta, bufferDelta })
 
   ### Public ###
 
@@ -565,7 +564,7 @@ class DisplayBuffer
 
   resumeMarkerObservers: ->
     marker.resumeEvents() for marker in @getMarkers()
-    @trigger 'markers-updated'
+    @emit 'markers-updated'
 
   refreshMarkerScreenPositions: ->
     for marker in @getMarkers()
@@ -620,7 +619,7 @@ class DisplayBuffer
       @pauseMarkerObservers()
       @pendingChangeEvent = changeEvent
     else
-      @triggerChanged(changeEvent, options.refreshMarkers)
+      @emitChanged(changeEvent, options.refreshMarkers)
 
   buildScreenLines: (startBufferRow, endBufferRow) ->
     newScreenLines = []
@@ -686,11 +685,11 @@ class DisplayBuffer
   handleBufferMarkersUpdated: =>
     if event = @pendingChangeEvent
       @pendingChangeEvent = null
-      @triggerChanged(event, false)
+      @emitChanged(event, false)
 
   handleBufferMarkerCreated: (marker) =>
     @createFoldForMarker(marker) if marker.matchesAttributes(@getFoldMarkerAttributes())
-    @trigger 'marker-created', @getMarker(marker.id)
+    @emit 'marker-created', @getMarker(marker.id)
 
   createFoldForMarker: (marker) ->
     new Fold(this, marker)
diff --git a/src/edit-session.coffee b/src/edit-session.coffee
index 126a5b8a7..b8f07a830 100644
--- a/src/edit-session.coffee
+++ b/src/edit-session.coffee
@@ -8,8 +8,7 @@ LanguageMode = require './language-mode'
 DisplayBuffer = require './display-buffer'
 Cursor = require './cursor'
 Selection = require './selection'
-{EventEmitter} = require 'emissary'
-{Subscriber} = require 'emissary'
+{EventEmitter, Subscriber} = require 'emissary'
 TextMateScopeSelector = require('first-mate').ScopeSelector
 
 # Public: The core model of Atom.
@@ -104,9 +103,9 @@ class EditSession
     @subscribe @state, 'changed', ({key, newValue}) =>
       switch key
         when 'scrollTop'
-          @trigger 'scroll-top-changed', newValue
+          @emit 'scroll-top-changed', newValue
         when 'scrollLeft'
-          @trigger 'scroll-left-changed', newValue
+          @emit 'scroll-left-changed', newValue
 
     project.addEditSession(this) if registerEditSession
 
@@ -115,20 +114,20 @@ class EditSession
     @buffer.retain()
     @subscribe @buffer, "path-changed", =>
       project.setPath(path.dirname(@getPath())) unless project.getPath()?
-      @trigger "title-changed"
-      @trigger "path-changed"
-    @subscribe @buffer, "contents-modified", => @trigger "contents-modified"
-    @subscribe @buffer, "contents-conflicted", => @trigger "contents-conflicted"
-    @subscribe @buffer, "modified-status-changed", => @trigger "modified-status-changed"
+      @emit "title-changed"
+      @emit "path-changed"
+    @subscribe @buffer, "contents-modified", => @emit "contents-modified"
+    @subscribe @buffer, "contents-conflicted", => @emit "contents-conflicted"
+    @subscribe @buffer, "modified-status-changed", => @emit "modified-status-changed"
     @preserveCursorPositionOnBufferReload()
 
   # Private:
   setDisplayBuffer: (@displayBuffer) ->
     @subscribe @displayBuffer, 'marker-created', @handleMarkerCreated
-    @subscribe @displayBuffer, "changed", (e) => @trigger 'screen-lines-changed', e
+    @subscribe @displayBuffer, "changed", (e) => @emit 'screen-lines-changed', e
     @subscribe @displayBuffer, "markers-updated", => @mergeIntersectingSelections()
     @subscribe @displayBuffer, 'grammar-changed', => @handleGrammarChange()
-    @subscribe @displayBuffer, 'soft-wrap-changed', (args...) => @trigger 'soft-wrap-changed', args...
+    @subscribe @displayBuffer, 'soft-wrap-changed', (args...) => @emit 'soft-wrap-changed', args...
 
   # Private:
   getViewClass: ->
@@ -144,7 +143,7 @@ class EditSession
     @displayBuffer.destroy()
     @languageMode.destroy()
     project?.removeEditSession(this)
-    @trigger 'destroyed'
+    @emit 'destroyed'
     @off()
 
   # Private:
@@ -871,7 +870,7 @@ class EditSession
       @cursors.push(cursor)
     else
       @remoteCursors.push(cursor)
-    @trigger 'cursor-added', cursor
+    @emit 'cursor-added', cursor
     cursor
 
   # Public: Removes and returns a cursor from the `EditSession`.
@@ -904,7 +903,7 @@ class EditSession
         if selection.intersectsBufferRange(selectionBufferRange)
           return selection
     else
-      @trigger 'selection-added', selection
+      @emit 'selection-added', selection
       selection
 
   # Public: Given a buffer range, this adds a new selection for it.
@@ -1424,7 +1423,7 @@ class EditSession
   # Private:
   handleGrammarChange: ->
     @unfoldAll()
-    @trigger 'grammar-changed'
+    @emit 'grammar-changed'
 
   # Private:
   handleMarkerCreated: (marker) =>
diff --git a/src/file.coffee b/src/file.coffee
index 6e88a899e..c6078aa07 100644
--- a/src/file.coffee
+++ b/src/file.coffee
@@ -103,12 +103,12 @@ class File
       @detectResurrectionAfterDelay()
     else if eventType is "rename"
       @setPath(path)
-      @trigger "moved"
+      @emit "moved"
     else if eventType is "change"
       oldContents = @cachedContents
       newContents = @read(true)
       return if oldContents == newContents
-      @trigger 'contents-changed'
+      @emit 'contents-changed'
 
   # Private:
   detectResurrectionAfterDelay: ->
@@ -121,7 +121,7 @@ class File
       @handleNativeChangeEvent("change", @getPath())
     else
       @cachedContents = null
-      @trigger "removed"
+      @emit "removed"
 
   # Private:
   subscribeToNativeChangeEvents: ->
diff --git a/src/git.coffee b/src/git.coffee
index 506afd48e..1ab2ab59b 100644
--- a/src/git.coffee
+++ b/src/git.coffee
@@ -1,8 +1,7 @@
 _ = require './underscore-extensions'
 fsUtils = require './fs-utils'
-{Subscriber} = require 'emissary'
-{EventEmitter} = require 'emissary'
 Task = require './task'
+{EventEmitter, Subscriber} = require 'emissary'
 GitUtils = require 'git-utils'
 
 # Public: Represents the underlying git operations performed by Atom.
@@ -125,7 +124,7 @@ class Git
     else
       delete @statuses[path]
     if currentPathStatus isnt pathStatus
-      @trigger 'status-changed', path, pathStatus
+      @emit 'status-changed', path, pathStatus
     pathStatus
 
   # Public: Determines if the given path is ignored.
@@ -274,4 +273,4 @@ class Git
       @statuses = statuses
       @upstream = upstream
       @branch = branch
-      @trigger 'statuses-changed' unless statusesUnchanged
+      @emit 'statuses-changed' unless statusesUnchanged
diff --git a/src/keymap.coffee b/src/keymap.coffee
index 68fc8c72c..01080ca0d 100644
--- a/src/keymap.coffee
+++ b/src/keymap.coffee
@@ -34,7 +34,7 @@ class Keymap
 
   loadBundledKeymaps: ->
     @loadDirectory(config.bundledKeymapsDirPath)
-    @trigger('bundled-keymaps-loaded')
+    @emit('bundled-keymaps-loaded')
 
   loadUserKeymaps: ->
     @loadDirectory(path.join(config.configDirPath, 'keymaps'))
diff --git a/src/language-mode.coffee b/src/language-mode.coffee
index 8574cd90c..8aa445e68 100644
--- a/src/language-mode.coffee
+++ b/src/language-mode.coffee
@@ -1,8 +1,7 @@
 {Range} = require 'telepath'
 _ = require './underscore-extensions'
 {OnigRegExp} = require 'oniguruma'
-{EventEmitter} = require 'emissary'
-{Subscriber} = require 'emissary'
+{EventEmitter, Subscriber} = require 'emissary'
 
 ### Internal ###
 
diff --git a/src/package-manager.coffee b/src/package-manager.coffee
index f291f8286..703e8d945 100644
--- a/src/package-manager.coffee
+++ b/src/package-manager.coffee
@@ -58,7 +58,7 @@ class PackageManager
     require '../exports/atom'
 
     @loadPackage(name) for name in @getAvailablePackageNames() when not @isPackageDisabled(name)
-    @trigger 'loaded'
+    @emit 'loaded'
 
   loadPackage: (name, options) ->
     if @isPackageDisabled(name)
diff --git a/src/project.coffee b/src/project.coffee
index b86e915a0..475f31007 100644
--- a/src/project.coffee
+++ b/src/project.coffee
@@ -125,7 +125,7 @@ class Project
     if originUrl = @repo?.getOriginUrl()
       @state.set('repoUrl', originUrl)
 
-    @trigger "path-changed"
+    @emit "path-changed"
 
   # Public: Returns the name of the root directory.
   getRootDirectory: ->
@@ -205,7 +205,7 @@ class Project
   # Public: Add the given {EditSession}.
   addEditSession: (editSession) ->
     @editSessions.push editSession
-    @trigger 'edit-session-created', editSession
+    @emit 'edit-session-created', editSession
 
   # Public: Return and removes the given {EditSession}.
   removeEditSession: (editSession) ->
@@ -274,7 +274,7 @@ class Project
   addBufferAtIndex: (buffer, index, options={}) ->
     @buffers[index] = buffer
     @state.get('buffers').insert(index, buffer.getState()) if options.updateState ? true
-    @trigger 'buffer-created', buffer
+    @emit 'buffer-created', buffer
 
   # Private: Removes a {TextBuffer} association from the project.
   #
diff --git a/src/selection.coffee b/src/selection.coffee
index d5745d860..d68940361 100644
--- a/src/selection.coffee
+++ b/src/selection.coffee
@@ -22,7 +22,7 @@ class Selection
     @marker.on 'destroyed', =>
       @destroyed = true
       @editSession.removeSelection(this)
-      @trigger 'destroyed' unless @editSession.destroyed
+      @emit 'destroyed' unless @editSession.destroyed
 
   # Private:
   destroy: ->
@@ -607,4 +607,4 @@ class Selection
   # Private:
   screenRangeChanged: ->
     screenRange = @getScreenRange()
-    @trigger 'screen-range-changed', screenRange
+    @emit 'screen-range-changed', screenRange
diff --git a/src/task.coffee b/src/task.coffee
index fd5b5e655..55f27d90f 100644
--- a/src/task.coffee
+++ b/src/task.coffee
@@ -69,7 +69,7 @@ class Task
   handleEvents: ->
     @childProcess.removeAllListeners()
     @childProcess.on 'message', ({event, args}) =>
-      @trigger(event, args...)
+      @emit(event, args...)
 
   # Public: Starts the task.
   #
diff --git a/src/text-buffer.coffee b/src/text-buffer.coffee
index ba795bdd6..fe8206343 100644
--- a/src/text-buffer.coffee
+++ b/src/text-buffer.coffee
@@ -1,3 +1,4 @@
+{EventEmitter, Subscriber} = require 'emissary'
 guid = require 'guid'
 Q = require 'q'
 {P} = require 'scandal'
@@ -5,9 +6,7 @@ telepath = require 'telepath'
 
 _ = require './underscore-extensions'
 fsUtils = require './fs-utils'
-{EventEmitter} = require 'emissary'
 File = require './file'
-{Subscriber} = require 'emissary'
 
 {Point, Range} = telepath
 
diff --git a/src/text-mate-grammar.coffee b/src/text-mate-grammar.coffee
index ad37a2259..fdbc54e8a 100644
--- a/src/text-mate-grammar.coffee
+++ b/src/text-mate-grammar.coffee
@@ -70,7 +70,7 @@ class TextMateGrammar
     return false unless _.include(@includedGrammarScopes, scopeName)
     @clearRules()
     syntax.grammarUpdated(@scopeName)
-    @trigger 'grammar-updated'
+    @emit 'grammar-updated'
     true
 
   getScore: (filePath, contents) ->
diff --git a/src/tokenized-buffer.coffee b/src/tokenized-buffer.coffee
index 55aaa37eb..c552d655f 100644
--- a/src/tokenized-buffer.coffee
+++ b/src/tokenized-buffer.coffee
@@ -1,7 +1,6 @@
 _ = require './underscore-extensions'
 TokenizedLine = require './tokenized-line'
-{EventEmitter} = require 'emissary'
-{Subscriber} = require 'emissary'
+{EventEmitter, Subscriber} = require 'emissary'
 Token = require './token'
 telepath = require 'telepath'
 {Point, Range} = telepath
@@ -62,7 +61,7 @@ class TokenizedBuffer
     @grammar = grammar
     @currentGrammarScore = score ? grammar.getScore(@buffer.getPath(), @buffer.getText())
     @subscribe @grammar, 'grammar-updated', => @resetTokenizedLines()
-    @trigger 'grammar-changed', grammar
+    @emit 'grammar-changed', grammar
 
   reloadGrammar: ->
     if grammar = syntax.selectGrammar(@buffer.getPath(), @buffer.getText())
@@ -98,7 +97,7 @@ class TokenizedBuffer
     lastRow = @buffer.getLastRow()
     @tokenizedLines = @buildPlaceholderTokenizedLinesForRows(0, lastRow)
     @invalidateRow(0)
-    @trigger "changed", { start: 0, end: lastRow, delta: 0 }
+    @emit "changed", { start: 0, end: lastRow, delta: 0 }
 
   tokenizeInBackground: ->
     return if not @visible or @pendingChunk or @destroyed
@@ -129,7 +128,7 @@ class TokenizedBuffer
 
       @validateRow(row)
       @invalidateRow(row + 1) unless filledRegion
-      @trigger "changed", { start: invalidRow, end: row, delta: 0 }
+      @emit "changed", { start: invalidRow, end: row, delta: 0 }
 
     @tokenizeInBackground() if @firstInvalidRow()?
 
@@ -168,7 +167,7 @@ class TokenizedBuffer
     if newEndStack and not _.isEqual(newEndStack, previousEndStack)
       @invalidateRow(end + delta + 1)
 
-    @trigger "changed", { start, end, delta, bufferChange: e }
+    @emit "changed", { start, end, delta, bufferChange: e }
 
   buildTokenizedLinesForRows: (startRow, endRow, startingStack) ->
     ruleStack = startingStack