diff --git a/spec/app/editor-spec.coffee b/spec/app/editor-spec.coffee
index 3525ea06d..7dd0ac97d 100644
--- a/spec/app/editor-spec.coffee
+++ b/spec/app/editor-spec.coffee
@@ -451,10 +451,10 @@ describe "Editor", ->
         editor.splitLeft().remove()
         editor.splitRight().remove()
 
-  describe "editor-open event", ->
-    it 'only triggers an editor-open event when it is first added to the DOM', ->
+  describe "editor:attached event", ->
+    it 'only triggers an editor:attached event when it is first added to the DOM', ->
       openHandler = jasmine.createSpy('openHandler')
-      editor.on 'editor-open', openHandler
+      editor.on 'editor:attached', openHandler
 
       editor.simulateDomAttachment()
       expect(openHandler).toHaveBeenCalled()
diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 6e5fd4248..0fc9dfc44 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -422,7 +422,7 @@ class Editor extends View
 
     @resetDisplay()
 
-    @trigger 'editor-open', [this]
+    @trigger 'editor:attached', [this]
 
   edit: (editSession) ->
     index = @editSessions.indexOf(editSession)
@@ -680,7 +680,7 @@ class Editor extends View
   remove: (selector, keepData) ->
     return super if keepData
 
-    @trigger 'before-remove'
+    @trigger 'editor:will-be-removed'
 
     @destroyEditSessions()
 
diff --git a/src/packages/autocomplete/src/autocomplete.coffee b/src/packages/autocomplete/src/autocomplete.coffee
index d0a23ceff..14da00332 100644
--- a/src/packages/autocomplete/src/autocomplete.coffee
+++ b/src/packages/autocomplete/src/autocomplete.coffee
@@ -6,7 +6,7 @@ module.exports =
 class Autocomplete extends SelectList
   @activate: (rootView) ->
     new Autocomplete(editor) for editor in rootView.getEditors()
-    rootView.on 'editor-open', (e, editor) -> new Autocomplete(editor) unless editor.mini
+    rootView.on 'editor:attached', (e, editor) -> new Autocomplete(editor) unless editor.mini
 
   @viewClass: -> "autocomplete #{super}"
 
diff --git a/src/packages/snippets/src/snippets.coffee b/src/packages/snippets/src/snippets.coffee
index 3d5fd2fa0..fc77ddf59 100644
--- a/src/packages/snippets/src/snippets.coffee
+++ b/src/packages/snippets/src/snippets.coffee
@@ -10,7 +10,7 @@ module.exports =
 
   activate: (@rootView) ->
     @loadSnippets()
-    @rootView.on 'editor-open', (e, editor) => @enableSnippetsInEditor(editor)
+    @rootView.on 'editor:attached', (e, editor) => @enableSnippetsInEditor(editor)
 
   loadSnippets: ->
     snippetsDir = fs.join(config.configDirPath, 'snippets')
diff --git a/src/packages/status-bar/src/status-bar.coffee b/src/packages/status-bar/src/status-bar.coffee
index 596b1cfea..841a0bce5 100644
--- a/src/packages/status-bar/src/status-bar.coffee
+++ b/src/packages/status-bar/src/status-bar.coffee
@@ -8,7 +8,7 @@ class StatusBar extends View
     for editor in rootView.getEditors()
       @appendToEditorPane(rootView, editor) if rootView.parents('html').length
 
-    rootView.on 'editor-open', (e, editor) =>
+    rootView.on 'editor:attached', (e, editor) =>
       @appendToEditorPane(rootView, editor)
 
   @appendToEditorPane: (rootView, editor) ->
diff --git a/src/packages/tabs/src/tabs.coffee b/src/packages/tabs/src/tabs.coffee
index 59bff4e2a..988cfb8b7 100644
--- a/src/packages/tabs/src/tabs.coffee
+++ b/src/packages/tabs/src/tabs.coffee
@@ -8,7 +8,7 @@ class Tabs extends View
     for editor in rootView.getEditors()
       @prependToEditorPane(rootView, editor) if rootView.parents('html').length
 
-    rootView.on 'editor-open', (e, editor) =>
+    rootView.on 'editor:attached', (e, editor) =>
       @prependToEditorPane(rootView, editor)
 
   @prependToEditorPane: (rootView, editor) ->
diff --git a/src/packages/wrap-guide/src/wrap-guide.coffee b/src/packages/wrap-guide/src/wrap-guide.coffee
index 583e17160..aad5d7ff9 100644
--- a/src/packages/wrap-guide/src/wrap-guide.coffee
+++ b/src/packages/wrap-guide/src/wrap-guide.coffee
@@ -9,7 +9,7 @@ class WrapGuide extends View
       if rootView.parents('html').length
         @appendToEditorPane(rootView, editor)
 
-    rootView.on 'editor-open', (e, editor) =>
+    rootView.on 'editor:attached', (e, editor) =>
       @appendToEditorPane(rootView, editor)
 
   @appendToEditorPane: (rootView, editor, config) ->