diff --git a/src/app/pane-column.coffee b/src/app/pane-column.coffee
index 016f2b0ed..963dc1b71 100644
--- a/src/app/pane-column.coffee
+++ b/src/app/pane-column.coffee
@@ -1,9 +1,9 @@
 $ = require 'jquery'
 _ = require 'underscore'
-PaneDivision = require 'pane-division'
+PaneGrid = require 'pane-grid'
 
 module.exports =
-class PaneColumn extends PaneDivision
+class PaneColumn extends PaneGrid
   @content: ->
     @div class: 'column'
 
diff --git a/src/app/pane-division.coffee b/src/app/pane-grid.coffee
similarity index 95%
rename from src/app/pane-division.coffee
rename to src/app/pane-grid.coffee
index 79d38712c..deca75735 100644
--- a/src/app/pane-division.coffee
+++ b/src/app/pane-grid.coffee
@@ -2,7 +2,7 @@ $ = require 'jquery'
 {View} = require 'space-pen'
 
 module.exports =
-class PaneDivision extends View
+class PaneGrid extends View
   @deserialize: ({children}, rootView) ->
     childViews = children.map (child) -> rootView.deserializeView(child)
     new this(childViews)
diff --git a/src/app/pane-row.coffee b/src/app/pane-row.coffee
index a193e57d0..c729e0b9a 100644
--- a/src/app/pane-row.coffee
+++ b/src/app/pane-row.coffee
@@ -1,9 +1,9 @@
 $ = require 'jquery'
 _ = require 'underscore'
-PaneDivision = require 'pane-division'
+PaneGrid = require 'pane-grid'
 
 module.exports =
-class PaneRow extends PaneDivision
+class PaneRow extends PaneGrid
   @content: ->
     @div class: 'row'