diff --git a/spec/pane-container-spec.coffee b/spec/pane-container-view-spec.coffee
similarity index 98%
rename from spec/pane-container-spec.coffee
rename to spec/pane-container-view-spec.coffee
index b2a861196..fa0bcb83d 100644
--- a/spec/pane-container-spec.coffee
+++ b/spec/pane-container-view-spec.coffee
@@ -1,10 +1,10 @@
 path = require 'path'
 temp = require 'temp'
-PaneContainer = require '../src/pane-container'
+PaneContainerView = require '../src/pane-container-view'
 PaneView = require '../src/pane-view'
 {_, $, View, $$} = require 'atom'
 
-describe "PaneContainer", ->
+describe "PaneContainerView", ->
   [TestView, container, pane1, pane2, pane3] = []
 
   beforeEach ->
@@ -18,7 +18,7 @@ describe "PaneContainer", ->
       save: -> @saved = true
       isEqual: (other) -> @name is other?.name
 
-    container = new PaneContainer
+    container = new PaneContainerView
     pane1 = new PaneView(new TestView('1'))
     container.setRoot(pane1)
     pane2 = pane1.splitRight(new TestView('2'))
@@ -146,7 +146,7 @@ describe "PaneContainer", ->
       item2b = new TestView('2b')
       item3a = new TestView('3a')
 
-      container = new PaneContainer
+      container = new PaneContainerView
       container.attachToDom()
       pane1 = new PaneView(item1a)
       container.setRoot(pane1)
diff --git a/spec/pane-view-spec.coffee b/spec/pane-view-spec.coffee
index d609d501a..7440f7e73 100644
--- a/spec/pane-view-spec.coffee
+++ b/spec/pane-view-spec.coffee
@@ -1,4 +1,4 @@
-PaneContainer = require '../src/pane-container'
+PaneContainerView = require '../src/pane-container-view'
 PaneView = require '../src/pane-view'
 {fs, $, View} = require 'atom'
 path = require 'path'
@@ -17,7 +17,7 @@ describe "PaneView", ->
 
   beforeEach ->
     atom.deserializers.add(TestView)
-    container = new PaneContainer
+    container = new PaneContainerView
     view1 = new TestView(id: 'view-1', text: 'View 1')
     view2 = new TestView(id: 'view-2', text: 'View 2')
     editor1 = atom.project.openSync('sample.js')
diff --git a/src/pane-container.coffee b/src/pane-container-view.coffee
similarity index 98%
rename from src/pane-container.coffee
rename to src/pane-container-view.coffee
index a6f90bcba..d61edf736 100644
--- a/src/pane-container.coffee
+++ b/src/pane-container-view.coffee
@@ -5,7 +5,7 @@ PaneContainerModel = require './pane-container-model'
 
 # Private: Manages the list of panes within a {WorkspaceView}
 module.exports =
-class PaneContainer extends View
+class PaneContainerView extends View
   atom.deserializers.add(this)
   Serializable.includeInto(this)
 
diff --git a/src/workspace-view.coffee b/src/workspace-view.coffee
index 815f75d30..b5bdff230 100644
--- a/src/workspace-view.coffee
+++ b/src/workspace-view.coffee
@@ -9,7 +9,7 @@ EditorView = require './editor-view'
 PaneView = require './pane-view'
 PaneColumnView = require './pane-column-view'
 PaneRowView = require './pane-row-view'
-PaneContainer = require './pane-container'
+PaneContainerView = require './pane-container-view'
 Editor = require './editor'
 
 # Public: The container for the entire Atom application.
@@ -60,7 +60,7 @@ class WorkspaceView extends View
 
   # Private:
   initialize: ({panes, @fullScreen}={}) ->
-    panes ?= new PaneContainer
+    panes ?= new PaneContainerView
     @panes.replaceWith(panes)
     @panes = panes