--- a/tests/test-evolve-list.t	Fri Nov 09 20:18:59 2018 +0100
+++ b/tests/test-evolve-list.t	Fri Nov 09 20:19:01 2018 +0100
@@ -17,13 +17,13 @@
   $ hg up 0
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo a >> a && hg ci --amend -m a
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg evolve --list
   d2ae7f538514: b
-    orphan: cb9a9f314b8b (obsolete parent)
+    unstable: cb9a9f314b8b (obsolete parent)
   
   177f92b77385: c
-    orphan: d2ae7f538514 (orphan parent)
+    unstable: d2ae7f538514 (unstable parent)
   
   $ cd ..
 
@@ -34,10 +34,10 @@
   adding a
   $ echo b > b && hg ci --amend -m ab
   $ hg phase --public --rev 0 --hidden
-  1 new phase-divergent changesets
+  1 new bumped changesets
   $ hg evolve --list
   88cc282e27fc: ab
-    phase-divergent: cb9a9f314b8b (immutable precursor)
+    bumped: cb9a9f314b8b (immutable precursor)
   
   $ cd ..
 
@@ -64,21 +64,21 @@
   rebasing 1:d2ae7f538514 "b"
   $ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True
   rebasing 1:d2ae7f538514 "b"
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg evolve --list
   c882616e9d84: b
-    content-divergent: a922b3733e98 (draft) (precursor d2ae7f538514)
+    divergent: a922b3733e98 (draft) (precursor d2ae7f538514)
   
   a922b3733e98: b
-    content-divergent: c882616e9d84 (draft) (precursor d2ae7f538514)
+    divergent: c882616e9d84 (draft) (precursor d2ae7f538514)
   
   $ hg evolve --list --rev c882616e9d84
   c882616e9d84: b
-    content-divergent: a922b3733e98 (draft) (precursor d2ae7f538514)
+    divergent: a922b3733e98 (draft) (precursor d2ae7f538514)
   
   $ hg phase -p a922b3733e98
   $ hg evolve --list
   c882616e9d84: b
-    content-divergent: a922b3733e98 (public) (precursor d2ae7f538514)
+    divergent: a922b3733e98 (public) (precursor d2ae7f538514)
   
   $ cd ..