     """
 
     findOptions = new FindOptions
-    search = new BufferSearch(findOptions)
+    model = new BufferSearch(findOptions)
 
     markersListener = jasmine.createSpy('markersListener')
-    search.onDidUpdate(markersListener)
+    model.onDidUpdate(markersListener)
 
     currentResultListener = jasmine.createSpy('currentResultListener')
-    search.onDidChangeCurrentResult(currentResultListener)
-
-    search.setEditor(editor)
+    model.onDidChangeCurrentResult(currentResultListener)
+
+    model.setEditor(editor)
     markersListener.reset()
 
-    search.setFindOptions(
-      findPattern: "a+"
+    model.search "a+",
       caseSensitive: false
       useRegex: true
       wholeWord: false
-    )
 
   afterEach ->
-    search.destroy()
+    model.destroy()
     editor.destroy()
 
   getHighlightedRanges = ->

      expect(currentResultListener).toHaveBeenCalledWith(markers[1])
      currentResultListener.reset()

      search.replace([markers[1]], "new-text")

      expect(editor.getText()).toBe """
        -----------

FindOptions = require '../lib/find-options'

describe "BufferSearch", ->
  [model, editor, markersListener, currentResultListener] = []

  beforeEach ->
    editor = new TextEditor
