diff --git a/spec/display-buffer-spec.coffee b/spec/display-buffer-spec.coffee
index af51986bf..494c31a08 100644
--- a/spec/display-buffer-spec.coffee
+++ b/spec/display-buffer-spec.coffee
@@ -1220,9 +1220,9 @@ describe "DisplayBuffer", ->
         expect(displayBuffer.getDecorations(class: 'one').length).toEqual 1
 
   describe "::scrollToScreenPosition(position, [options])", ->
-    it "triggers ::onDidChangeScrollPosition with the logical coordinates along with the options", ->
-      scrollSpy = jasmine.createSpy("::onDidChangeScrollPosition")
-      displayBuffer.onDidChangeScrollPosition(scrollSpy)
+    it "triggers ::onDidRequestAutoscroll with the logical coordinates along with the options", ->
+      scrollSpy = jasmine.createSpy("::onDidRequestAutoscroll")
+      displayBuffer.onDidRequestAutoscroll(scrollSpy)
 
       displayBuffer.scrollToScreenPosition([8, 20])
       displayBuffer.scrollToScreenPosition([8, 20], center: true)
diff --git a/src/display-buffer.coffee b/src/display-buffer.coffee
index a039ecc4a..ac4fd86e7 100644
--- a/src/display-buffer.coffee
+++ b/src/display-buffer.coffee
@@ -125,7 +125,7 @@ class DisplayBuffer extends Model
   onDidChangeCharacterWidths: (callback) ->
     @emitter.on 'did-change-character-widths', callback
 
-  onDidChangeScrollPosition: (callback) ->
+  onDidRequestAutoscroll: (callback) ->
     @emitter.on 'did-change-scroll-position', callback
 
   observeDecorations: (callback) ->
diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee
index ad6883c4e..ac9ef8242 100644
--- a/src/text-editor-presenter.coffee
+++ b/src/text-editor-presenter.coffee
@@ -159,9 +159,7 @@ class TextEditorPresenter
 
     @disposables.add @model.onDidAddDecoration(@didAddDecoration.bind(this))
     @disposables.add @model.onDidAddCursor(@didAddCursor.bind(this))
-    @disposables.add @model.onDidChangeScrollPosition(@didChangeScrollPosition.bind(this))
-    # @disposables.add @model.onDidChangeScrollTop(@setScrollTop.bind(this))
-    # @disposables.add @model.onDidChangeScrollLeft(@setScrollLeft.bind(this))
+    @disposables.add @model.onDidRequestAutoscroll(@requestAutoscroll.bind(this))
     @observeDecoration(decoration) for decoration in @model.getDecorations()
     @observeCursor(cursor) for cursor in @model.getCursors()
     @disposables.add @model.onDidAddGutter(@didAddGutter.bind(this))
@@ -1474,7 +1472,7 @@ class TextEditorPresenter
       @startBlinkingCursorsAfterDelay()
       @emitDidUpdateState()
 
-  didChangeScrollPosition: (position) ->
+  requestAutoscroll: (position) ->
     @pendingScrollLogicalPosition = position
     @pendingScrollTop = null
     @pendingScrollLeft = null
diff --git a/src/text-editor.coffee b/src/text-editor.coffee
index 76d09d381..2c39431a5 100644
--- a/src/text-editor.coffee
+++ b/src/text-editor.coffee
@@ -436,8 +436,8 @@ class TextEditor extends Model
 
     atom.views.getView(this).onDidChangeScrollLeft(callback)
 
-  onDidChangeScrollPosition: (callback) ->
-    @displayBuffer.onDidChangeScrollPosition(callback)
+  onDidRequestAutoscroll: (callback) ->
+    @displayBuffer.onDidRequestAutoscroll(callback)
 
   # TODO Remove once the tabs package no longer uses .on subscriptions
   onDidChangeIcon: (callback) ->