--- a/tests/test-stack-branch.t	Sat Jun 01 02:30:14 2019 +0200
+++ b/tests/test-stack-branch.t	Tue Jun 04 11:08:44 2019 +0200
@@ -87,14 +87,14 @@
 Test "t#" reference
 -------------------
 
-  $ hg up b2
+  $ hg up s2
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg up foo
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg up b42
-  abort: cannot resolve "b42": branch "foo" has only 4 non-public changesets
+  $ hg up s42
+  abort: cannot resolve "s42": branch "foo" has only 4 non-public changesets
   [255]
-  $ hg up b2
+  $ hg up s2
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg summary
   parent: 3:f61adbacd17a 
@@ -132,7 +132,7 @@
   s2@ c_d (current)
   s1: c_c
   s0^ c_b (base)
-  $ hg up b3
+  $ hg up s3
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg stack
   ### target: foo (branch)
@@ -141,7 +141,7 @@
   s2: c_d
   s1: c_c
   s0^ c_b (base)
-  $ hg up b2
+  $ hg up s2
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 Also test the revset:
@@ -294,7 +294,7 @@
   s2@ c_D (current)
   s1: c_c
   s0^ c_b (base)
-  $ hg phase --public b1
+  $ hg phase --public s1
   $ hg stack
   ### target: foo (branch) (2 heads)
   s5: c_h
@@ -308,7 +308,7 @@
 Check that stack doesn't show changeset with a topic
 ----------------------------------------------------
 
-  $ hg topic --rev b4::b5 sometopic
+  $ hg topic --rev s4::s5 sometopic
   changed topic on 2 changesets to "sometopic"
   $ hg stack
   ### target: foo (branch)