diff --git a/spec/editor-spec.coffee b/spec/editor-spec.coffee
index d95dbc7c6..8274c28ae 100644
--- a/spec/editor-spec.coffee
+++ b/spec/editor-spec.coffee
@@ -1,5 +1,5 @@
 clipboard = require 'clipboard'
-Editor = require '../src/editor'
+Editor = require '../src/text-editor'
 
 describe "Editor", ->
   [buffer, editor, lineLengths] = []
diff --git a/spec/random-editor-spec.coffee b/spec/random-editor-spec.coffee
index 8c3a65d0b..e08f598c0 100644
--- a/spec/random-editor-spec.coffee
+++ b/spec/random-editor-spec.coffee
@@ -1,7 +1,7 @@
 {times, random} = require 'underscore-plus'
 randomWords = require 'random-words'
 TextBuffer = require 'text-buffer'
-Editor = require '../src/editor'
+Editor = require '../src/text-editor'
 
 describe "Editor", ->
   [editor, tokenizedBuffer, buffer, steps, previousSteps] = []
diff --git a/spec/selection-spec.coffee b/spec/selection-spec.coffee
index cbaf3be86..d3cd09c54 100644
--- a/spec/selection-spec.coffee
+++ b/spec/selection-spec.coffee
@@ -1,4 +1,4 @@
-Editor = require '../src/editor'
+Editor = require '../src/text-editor'
 
 describe "Selection", ->
   [buffer, editor, selection] = []
diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index b9575491e..9f99ba87f 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -12,7 +12,7 @@ KeymapManager = require '../src/keymap-extensions'
 Config = require '../src/config'
 {Point} = require 'text-buffer'
 Project = require '../src/project'
-Editor = require '../src/editor'
+Editor = require '../src/text-editor'
 EditorView = require '../src/text-editor-view'
 TokenizedBuffer = require '../src/tokenized-buffer'
 EditorComponent = require '../src/text-editor-component'
diff --git a/spec/window-spec.coffee b/spec/window-spec.coffee
index 6c588ec2d..7cfa93895 100644
--- a/spec/window-spec.coffee
+++ b/spec/window-spec.coffee
@@ -1,6 +1,6 @@
 {$, $$} = require 'atom'
 path = require 'path'
-Editor = require '../src/editor'
+Editor = require '../src/text-editor'
 WindowEventHandler = require '../src/window-event-handler'
 
 describe "Window", ->
diff --git a/src/atom.coffee b/src/atom.coffee
index 181406bfc..cb80a90d0 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -215,7 +215,7 @@ class Atom extends Model
     @deserializers.add(TextBuffer)
     TokenizedBuffer = require './tokenized-buffer'
     DisplayBuffer = require './display-buffer'
-    Editor = require './editor'
+    Editor = require './text-editor'
 
     @windowEventHandler = new WindowEventHandler
 
diff --git a/src/pane.coffee b/src/pane.coffee
index 7eb7dd5e3..93952b1a1 100644
--- a/src/pane.coffee
+++ b/src/pane.coffee
@@ -4,7 +4,7 @@
 Serializable = require 'serializable'
 Grim = require 'grim'
 PaneAxis = require './pane-axis'
-Editor = require './editor'
+Editor = require './text-editor'
 PaneView = null
 
 # Extended: A container for presenting content in the center of the workspace.
diff --git a/src/project.coffee b/src/project.coffee
index 529acd830..8ecd6604b 100644
--- a/src/project.coffee
+++ b/src/project.coffee
@@ -11,7 +11,7 @@ Serializable = require 'serializable'
 TextBuffer = require 'text-buffer'
 {Directory} = require 'pathwatcher'
 
-Editor = require './editor'
+Editor = require './text-editor'
 Task = require './task'
 GitRepository = require './git-repository'
 
diff --git a/src/text-editor-view.coffee b/src/text-editor-view.coffee
index a4af6ad48..994d88d37 100644
--- a/src/text-editor-view.coffee
+++ b/src/text-editor-view.coffee
@@ -2,7 +2,7 @@
 React = require 'react-atom-fork'
 {defaults} = require 'underscore-plus'
 TextBuffer = require 'text-buffer'
-Editor = require './editor'
+Editor = require './text-editor'
 EditorComponent = require './text-editor-component'
 {deprecate} = require 'grim'
 
diff --git a/src/editor.coffee b/src/text-editor.coffee
similarity index 100%
rename from src/editor.coffee
rename to src/text-editor.coffee
diff --git a/src/workspace-view.coffee b/src/workspace-view.coffee
index eb54cbc3c..2208d88cf 100644
--- a/src/workspace-view.coffee
+++ b/src/workspace-view.coffee
@@ -13,7 +13,7 @@ PaneView = require './pane-view'
 PaneColumnView = require './pane-column-view'
 PaneRowView = require './pane-row-view'
 PaneContainerView = require './pane-container-view'
-Editor = require './editor'
+Editor = require './text-editor'
 
 atom.commands.add '.workspace',
   'window:increase-font-size': -> @getModel().increaseFontSize()
diff --git a/src/workspace.coffee b/src/workspace.coffee
index 35f8577a2..d4296f09c 100644
--- a/src/workspace.coffee
+++ b/src/workspace.coffee
@@ -6,7 +6,7 @@ Q = require 'q'
 Serializable = require 'serializable'
 Delegator = require 'delegato'
 {Emitter} = require 'event-kit'
-Editor = require './editor'
+Editor = require './text-editor'
 PaneContainer = require './pane-container'
 Pane = require './pane'
 ViewRegistry = require './view-registry'