--- a/hgext3rd/evolve/__init__.py	Fri Aug 31 09:21:19 2018 +0200
+++ b/hgext3rd/evolve/__init__.py	Fri Aug 31 14:26:37 2018 +0200
@@ -1403,9 +1403,9 @@
     cmdutil.unfinishedstates.append(data)
 
     afterresolved = ('evolvestate', _('hg evolve --continue'))
-    grabresolved = ('pickstate', _('hg pick --continue'))
+    pickresolved = ('pickstate', _('hg pick --continue'))
     cmdutil.afterresolvedstates.append(afterresolved)
-    cmdutil.afterresolvedstates.append(grabresolved)
+    cmdutil.afterresolvedstates.append(pickresolved)
 
     if util.safehasattr(cmdutil, 'STATES'):
         statedata = ('evolve', cmdutil.fileexistspredicate('evolvestate'),

--- a/hgext3rd/evolve/evolvecmd.py	Fri Aug 31 09:21:19 2018 +0200
+++ b/hgext3rd/evolve/evolvecmd.py	Fri Aug 31 14:26:37 2018 +0200
@@ -230,7 +230,7 @@
 
     # Checking for whether the phase-divergent changeset has common parents as
     # it's precursors. Phase-divergent changeset and precursor having different
-    # parents is a result of when the changeset is rebased, grabbed, histedit or
+    # parents is a result of when the changeset is rebased, picked, histedit or
     # evolved or any other operation which can change parent. In such cases,
     # when parents are not same, we first rebase the divergent changeset onto
     # parent or precursor and then perform later steps

--- a/hgext3rd/evolve/state.py	Fri Aug 31 09:21:19 2018 +0200
+++ b/hgext3rd/evolve/state.py	Fri Aug 31 14:26:37 2018 +0200
@@ -28,7 +28,7 @@
 from mercurial.i18n import _
 
 class cmdstate():
-    """a wrapper class to store the state of commands like `evolve`, `grab`
+    """a wrapper class to store the state of commands like `evolve`, `pick`
 
     All the data for the state is stored in the form of key-value pairs in a
     dictionary.