diff --git a/src/editor-view.coffee b/src/editor-view.coffee
index 59b095a1e..ea82127d8 100644
--- a/src/editor-view.coffee
+++ b/src/editor-view.coffee
@@ -1,6 +1,6 @@
 {View, $, $$$} = require './space-pen-extensions'
 TextBuffer = require './text-buffer'
-Gutter = require './gutter'
+GutterView = require './gutter-view'
 {Point, Range} = require 'text-buffer'
 Editor = require './editor'
 CursorView = require './cursor-view'
@@ -47,7 +47,7 @@ class EditorView extends View
     attributes = { class: @classes(params), tabindex: -1 }
     _.extend(attributes, params.attributes) if params.attributes
     @div attributes, =>
-      @subview 'gutter', new Gutter
+      @subview 'gutter', new GutterView
       @div class: 'scroll-view', outlet: 'scrollView', =>
         @div class: 'overlayer', outlet: 'overlayer'
         @div class: 'lines', outlet: 'renderedLines'
diff --git a/src/gutter.coffee b/src/gutter-view.coffee
similarity index 99%
rename from src/gutter.coffee
rename to src/gutter-view.coffee
index c66191cc0..cae0d51c0 100644
--- a/src/gutter.coffee
+++ b/src/gutter-view.coffee
@@ -6,7 +6,7 @@ _ = require 'underscore-plus'
 #
 # The gutter also indicates if rows are folded.
 module.exports =
-class Gutter extends View
+class GutterView extends View
 
   ### Internal ###