   didAddGutter: (gutter) ->
     gutterDisposables = new CompositeDisposable
     gutterDisposables.add gutter.onDidChangeVisible =>
-      @updateCustomGutterState()
+      @updateGutterOrderState()
       @updateCustomGutterDecorationState()
     gutterDisposables.add gutter.onDidDestroy =>
       @disposables.remove(gutterDisposables)
       gutterDisposables.dispose()
-      @updateCustomGutterState()
+      @updateGutterOrderState()
       # It is not necessary to @updateCustomGutterDecorationState here.
       # The destroyed gutter will be removed from the list of gutters in @state,
       # and thus will be removed from the DOM.
     @disposables.add(gutterDisposables)
-    @updateCustomGutterState()
+    @updateGutterOrderState()
     @updateCustomGutterDecorationState()
 
-  updateCustomGutterState: ->
-    @batch "shouldUpdateCustomGutterState", ->
+  updateGutterOrderState: ->
+    @batch "shouldUpdateGutterOrderState", ->
       @state.gutters.sortedDescriptions = []
       if @model.isMini()
         return

      @showLineNumbers = newValue
      @updateLineNumberGutterState()
      @updateCommonGutterState()
      @updateCustomGutterState()

  didChangeGrammar: ->
    @observeConfig()
    @updateContentState()
    @updateLineNumberGutterState()
    @updateCommonGutterState()
    @updateCustomGutterState()

  buildState: ->
    @state =

      @updateLineNumberGutterState()
      @updateLineNumbersState()
      @updateCommonGutterState()
      @updateGutterOrderState()
      @updateCustomGutterDecorationState()
    @disposables.add @model.onDidChangeLineNumberGutterVisible =>
      @updateLineNumberGutterState()
      @updateCommonGutterState()
      @updateGutterOrderState()
    @disposables.add @model.onDidAddDecoration(@didAddDecoration.bind(this))
    @disposables.add @model.onDidAddCursor(@didAddCursor.bind(this))
    @disposables.add @model.onDidChangeScrollTop(@setScrollTop.bind(this))
