3 files changed, 6 insertions, 4 deletions
diff --git a/atom/packages/vim-surround/lib/command/change.coffee b/atom/packages/vim-surround/lib/command/change.coffee
index b1860f5..7bdf623 100644
--- a/atom/packages/vim-surround/lib/command/change.coffee
+++ b/atom/packages/vim-surround/lib/command/change.coffee
@@ -6,7 +6,7 @@ Selector = require './selector'
 module.exports = class Change
   constructor: (config) ->
     @command = config.changeSurroundCommand
-    @context = "atom-text-editor.vim-mode.command-mode"
+    @context = "atom-text-editor.vim-mode.normal-mode"
     @disposables = new CompositeDisposable
     @curPairs = []
     @curPairsWithTarget = []
diff --git a/atom/packages/vim-surround/lib/command/delete.coffee b/atom/packages/vim-surround/lib/command/delete.coffee
index aa5eec0..744b3a1 100644
--- a/atom/packages/vim-surround/lib/command/delete.coffee
+++ b/atom/packages/vim-surround/lib/command/delete.coffee
@@ -1,4 +1,4 @@
-{CompositeDisposable} = require 'atom'
+{compositedisposable} = require 'atom'
 
 Base = require './base'
 Selector = require './selector'
@@ -6,7 +6,7 @@ Selector = require './selector'
 module.exports = class Delete extends Base
   constructor: (config) ->
     @command = config.deleteSurroundCommand
-    @context = "atom-text-editor.vim-mode.command-mode"
+    @context = "atom-text-editor.vim-mode.normal-mode"
     super config
 
   getName: (key) -> "delete-#{key}"
diff --git a/atom/packages/vim-surround/lib/command/selector.coffee b/atom/packages/vim-surround/lib/command/selector.coffee
index aae3541..bcb3c15 100644
--- a/atom/packages/vim-surround/lib/command/selector.coffee
+++ b/atom/packages/vim-surround/lib/command/selector.coffee
@@ -1,4 +1,6 @@
-vimModePath = atom.packages.resolvePackagePath('vim-mode')
+vimModePath = atom.packages.resolvePackagePath('vim-mode') or
+              atom.packages.resolvePackagePath('vim-mode-next')
+
 {SelectInsideQuotes, SelectInsideBrackets} = require "#{vimModePath}/lib/text-objects"
 
 module.exports = class Selector