diff --git a/spec/app/pane-container-spec.coffee b/spec/app/pane-container-spec.coffee
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/pane-grid.coffee b/src/app/pane-axis.coffee
similarity index 95%
rename from src/app/pane-grid.coffee
rename to src/app/pane-axis.coffee
index 3d54fd64d..9aa4fda81 100644
--- a/src/app/pane-grid.coffee
+++ b/src/app/pane-axis.coffee
@@ -2,7 +2,7 @@ $ = require 'jquery'
 {View} = require 'space-pen'
 
 module.exports =
-class PaneGrid extends View
+class PaneAxis extends View
   @deserialize: ({children}) ->
     childViews = children.map (child) -> deserialize(child)
     new this(childViews)
diff --git a/src/app/pane-column.coffee b/src/app/pane-column.coffee
index f00c7ed23..43ba40cbb 100644
--- a/src/app/pane-column.coffee
+++ b/src/app/pane-column.coffee
@@ -1,9 +1,9 @@
 $ = require 'jquery'
 _ = require 'underscore'
-PaneGrid = require 'pane-grid'
+PaneAxis = require 'pane-axis'
 
 module.exports =
-class PaneColumn extends PaneGrid
+class PaneColumn extends PaneAxis
   @content: ->
     @div class: 'column'
 
diff --git a/src/app/pane-row.coffee b/src/app/pane-row.coffee
index c729e0b9a..ce7a09f82 100644
--- a/src/app/pane-row.coffee
+++ b/src/app/pane-row.coffee
@@ -1,9 +1,9 @@
 $ = require 'jquery'
 _ = require 'underscore'
-PaneGrid = require 'pane-grid'
+PaneAxis = require 'pane-axis'
 
 module.exports =
-class PaneRow extends PaneGrid
+class PaneRow extends PaneAxis
   @content: ->
     @div class: 'row'