diff --git a/src/pane-axis-model.coffee b/src/pane-axis-model.coffee
index bbea4f969..e3e10f5e0 100644
--- a/src/pane-axis-model.coffee
+++ b/src/pane-axis-model.coffee
@@ -2,8 +2,8 @@
 {flatten} = require 'underscore-plus'
 Serializable = require 'serializable'
 
-PaneRow = null
-PaneColumn = null
+PaneRowView = null
+PaneColumnView = null
 
 module.exports =
 class PaneAxisModel extends Model
@@ -34,9 +34,9 @@ class PaneAxisModel extends Model
 
   getViewClass: ->
     if @orientation is 'vertical'
-      PaneColumn ?= require './pane-column'
+      PaneColumnView ?= require './pane-column-view'
     else
-      PaneRow ?= require './pane-row'
+      PaneRowView ?= require './pane-row-view'
 
   getPanes: ->
     flatten(@children.map (child) -> child.getPanes())
diff --git a/src/pane-axis.coffee b/src/pane-axis-view.coffee
similarity index 97%
rename from src/pane-axis.coffee
rename to src/pane-axis-view.coffee
index b69ea3dfb..f3086cbb1 100644
--- a/src/pane-axis.coffee
+++ b/src/pane-axis-view.coffee
@@ -3,7 +3,7 @@ PaneView = null
 
 ### Internal ###
 module.exports =
-class PaneAxis extends View
+class PaneAxisView extends View
   initialize: (@model) ->
     @onChildAdded(child) for child in @model.children
     @subscribe @model.children, 'changed', @onChildrenChanged
diff --git a/src/pane-column.coffee b/src/pane-column-view.coffee
similarity index 68%
rename from src/pane-column.coffee
rename to src/pane-column-view.coffee
index 4a89e0a6a..ac9d1df6e 100644
--- a/src/pane-column.coffee
+++ b/src/pane-column-view.coffee
@@ -1,10 +1,10 @@
 {$} = require './space-pen-extensions'
 _ = require 'underscore-plus'
-PaneAxis = require './pane-axis'
+PaneAxisView = require './pane-axis-view'
 
 # Internal:
 module.exports =
-class PaneColumn extends PaneAxis
+class PaneColumnView extends PaneAxisView
 
   @content: ->
     @div class: 'pane-column'
diff --git a/src/pane-row.coffee b/src/pane-row-view.coffee
similarity index 68%
rename from src/pane-row.coffee
rename to src/pane-row-view.coffee
index 76106ab61..8808ce36c 100644
--- a/src/pane-row.coffee
+++ b/src/pane-row-view.coffee
@@ -1,11 +1,11 @@
 {$} = require './space-pen-extensions'
 _ = require 'underscore-plus'
-PaneAxis = require './pane-axis'
+PaneAxisView = require './pane-axis-view'
 
 ### Internal ###
 
 module.exports =
-class PaneRow extends PaneAxis
+class PaneRowView extends PaneAxisView
   @content: ->
     @div class: 'pane-row'
 
diff --git a/src/workspace-view.coffee b/src/workspace-view.coffee
index 5747b7bae..815f75d30 100644
--- a/src/workspace-view.coffee
+++ b/src/workspace-view.coffee
@@ -7,8 +7,8 @@ fs = require 'fs-plus'
 Serializable = require 'serializable'
 EditorView = require './editor-view'
 PaneView = require './pane-view'
-PaneColumn = require './pane-column'
-PaneRow = require './pane-row'
+PaneColumnView = require './pane-column-view'
+PaneRowView = require './pane-row-view'
 PaneContainer = require './pane-container'
 Editor = require './editor'
 
@@ -39,7 +39,7 @@ Editor = require './editor'
 module.exports =
 class WorkspaceView extends View
   Serializable.includeInto(this)
-  atom.deserializers.add(this, PaneView, PaneRow, PaneColumn, EditorView)
+  atom.deserializers.add(this, PaneView, PaneRowView, PaneColumnView, EditorView)
 
   @version: 2