diff --git a/tests/test-copytrace-errormsg.t b/tests/test-copytrace-errormsg.t
--- a/tests/test-copytrace-errormsg.t
+++ b/tests/test-copytrace-errormsg.t
@@ -32,4 +32,4 @@
   $ hg rebase -s 1 -d . --tracecopies
   rebasing 1:812796267395 "2"
   merging 2 and 1 to 2
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/812796267395-81e11405-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/812796267395-81e11405-rebase.hg (glob)
diff --git a/tests/test-copytrace.t b/tests/test-copytrace.t
--- a/tests/test-copytrace.t
+++ b/tests/test-copytrace.t
@@ -42,7 +42,7 @@
   rebasing 2:557f403c0afd "mod a, mod dir/file.txt" (tip)
   merging b and a to b
   merging dir2/file.txt and dir/file.txt to dir2/file.txt
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/557f403c0afd-9926eeff-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/557f403c0afd-9926eeff-rebase.hg (glob)
   $ cd ..
   $ rm -rf server
   $ rm -rf repo
@@ -117,7 +117,7 @@
   $ hg rebase -s . -d 2
   rebasing 3:9d5cf99c3d9f "mod a" (tip)
   merging b and a to b
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9d5cf99c3d9f-f02358cc-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9d5cf99c3d9f-f02358cc-rebase.hg (glob)
   $ cd ..
   $ rm -rf server
   $ rm -rf repo
@@ -154,7 +154,7 @@
   $ hg rebase -s . -d 0
   rebasing 3:fbe97126b396 "mod b" (tip)
   merging a and b to a
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fbe97126b396-cf5452a1-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fbe97126b396-cf5452a1-rebase.hg (glob)
   $ cd ..
   $ rm -rf server
   $ rm -rf repo
@@ -183,7 +183,7 @@
   $ hg rebase -s . -d 1
   rebasing 2:5268f05aa168 "mod a" (tip)
   merging b and a to b
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5268f05aa168-284f6515-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5268f05aa168-284f6515-rebase.hg (glob)
   $ cd ..
   $ rm -rf server
   $ rm -rf repo
@@ -219,7 +219,7 @@
   $ hg rebase -s . -d 2
   rebasing 3:6b2f4cece40f "mod dir/a" (tip)
   merging dir/b and dir/a to dir/b
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6b2f4cece40f-503efe60-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6b2f4cece40f-503efe60-rebase.hg (glob)
   $ cd ..
   $ rm -rf server
   $ rm -rf repo
@@ -248,7 +248,7 @@
 
   $ hg rebase -s 1 -d 2
   rebasing 1:472e38d57782 "mv a b"
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-17d50e29-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-17d50e29-rebase.hg (glob)
   $ hg up -q c492ed3c7e35dcd1dc938053b8adf56e2cfbd062
   $ ls
   b
@@ -327,7 +327,7 @@
   $ hg rebase -s . -d 1
   rebasing 2:a33d80b6e352 "mv dir/ dir2/" (tip)
   merging dir/a and dir2/a to dir2/a
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a33d80b6e352-fecb9ada-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a33d80b6e352-fecb9ada-rebase.hg (glob)
   $ cd ..
   $ rm -rf server
   $ rm -rf repo
@@ -359,7 +359,7 @@
   $ hg rebase -s . -d 2
   rebasing 3:d41316942216 "mod a" (tip)
   merging c and a to c
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d41316942216-2b5949bc-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d41316942216-2b5949bc-rebase.hg (glob)
 
   $ cd ..
   $ rm -rf server
@@ -394,7 +394,7 @@
   merging a and b to b
   rebasing 2:d3efd280421d "mv b c"
   merging b and c to c
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-ab8d3c58-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/472e38d57782-ab8d3c58-rebase.hg (glob)
 
   $ cd ..
   $ rm -rf server
@@ -430,7 +430,7 @@
   $ hg rebase -s . -d 2
   rebasing 3:ef716627c70b "mod a" (tip)
   merging b and a to b
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg (glob)
   $ ls
   b
   c
@@ -501,7 +501,7 @@
   rebasing 2:ef716627c70b "mod a" (tip)
   merging b and a to b
   merging c and a to c
-  saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/ef716627c70b-24681561-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/ef716627c70b-24681561-rebase.hg (glob)
   $ ls
   b
   c
diff --git a/tests/test-dirsync.t b/tests/test-dirsync.t
--- a/tests/test-dirsync.t
+++ b/tests/test-dirsync.t
@@ -219,7 +219,7 @@
        442 (manifests)
        317  dir1/b
        331  dir2/subdir/b
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a6e4f018e982-f4dc39cf-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a6e4f018e982-f4dc39cf-amend.hg (glob)
   1 changesets found
   uncompressed size of bundle content:
        282 (changelog)
@@ -332,7 +332,7 @@
   $ hg rebase --config extensions.rebase= -d 1
   rebasing 2:70b4edc7f658 "edit dir1/a with sync on" (tip)
   mirrored changes in 'dir1/a' to 'dir2/a'
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/70b4edc7f658-c81f5ea9-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/70b4edc7f658-c81f5ea9-rebase.hg (glob)
   $ hg diff --git -r ".^" -r .
   diff --git a/dir1/a b/dir1/a
   --- a/dir1/a
@@ -384,7 +384,7 @@
   $ echo a >> dir2/a
   $ hg commit --amend -m "add dir1/a" dir2/a
   mirrored changes in 'dir2/a' to 'dir1/a'
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9eb46ceb8af3-2c09d2e4-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9eb46ceb8af3-2c09d2e4-amend.hg (glob)
   $ hg status
   A dir1/b
   $ hg log -r . --stat
@@ -408,7 +408,7 @@
   $ hg commit --amend -m "add dir1/a"
   mirrored adding 'dir1/b' to 'dir2/b'
   mirrored changes in 'dir1/a' to 'dir2/a'
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/50bf2325c501-ac54e4d9-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/50bf2325c501-ac54e4d9-amend.hg (glob)
   $ hg status
   $ hg log -r . --stat
   changeset:   0:5245011388b8
diff --git a/tests/test-fastmanifest-access.t b/tests/test-fastmanifest-access.t
--- a/tests/test-fastmanifest-access.t
+++ b/tests/test-fastmanifest-access.t
@@ -154,7 +154,7 @@
   $ hg rebase -r 5:: -d 4 --config extensions.rebase=
   rebasing 5:5234b99c4f1d "add e"
   rebasing 6:dd82c74514cb "add f" (tip)
-  saved backup bundle to $TESTTMP/accesspattern/.hg/strip-backup/5234b99c4f1d-c2e049ad-backup.hg (glob)
+  saved backup bundle to $TESTTMP/accesspattern/.hg/strip-backup/5234b99c4f1d-c2e049ad-rebase.hg (glob)
   $ printaccessedrevs
   =================================================
   CACHE MISS ['7', '8']
diff --git a/tests/test-fbamend.t b/tests/test-fbamend.t
--- a/tests/test-fbamend.t
+++ b/tests/test-fbamend.t
@@ -69,13 +69,13 @@
   $ hg amend --fixup
   rebasing the children of 34414ab6546d.preamend
   rebasing 2:a764265b74cf "b"
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a764265b74cf-c5eef4f8-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a764265b74cf-c5eef4f8-rebase.hg (glob)
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/86cf3bb05fcf-36a6cbd7-preamend-backup.hg (glob)
   $ echo a >> a
   $ hg amend --rebase
   rebasing the children of 7817096bf624.preamend
   rebasing 3:e1c831172263 "b"
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/e1c831172263-eee3b8f6-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/e1c831172263-eee3b8f6-rebase.hg (glob)
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/34414ab6546d-72d06a8e-preamend-backup.hg (glob)
 
 Test that current bookmark is maintained
@@ -87,7 +87,7 @@
   $ hg amend --rebase
   rebasing the children of bm.preamend
   rebasing 3:1e390e3ec656 "b"
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/1e390e3ec656-8362bab7-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/1e390e3ec656-8362bab7-rebase.hg (glob)
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/7817096bf624-d72fddeb-preamend-backup.hg (glob)
   $ hg bookmarks
    * bm                        2:7635008c16e1
@@ -120,7 +120,7 @@
   
   $ echo a >> a
   $ hg amend
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/edf5fd2f5332-81b0ec5b-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/edf5fd2f5332-81b0ec5b-amend.hg (glob)
   $ hg log -G -T '{node|short} {desc} {bookmarks}\n'
   @  0889a0030a17 aa bm
   |
@@ -135,7 +135,7 @@
   $ hg amend --fixup
   rebasing the children of bm.preamend
   rebasing 3:2d6884e15790 "b"
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/2d6884e15790-909076cb-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/2d6884e15790-909076cb-rebase.hg (glob)
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/7635008c16e1-65f65ff6-preamend-backup.hg (glob)
   $ hg log -G -T '{node|short} {desc} {bookmarks}\n'
   o  6ba7926ba204 b
@@ -171,7 +171,7 @@
   
   $ echo a >> a
   $ hg amend
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/94eb429c9465-30a7ee2c-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/94eb429c9465-30a7ee2c-amend.hg (glob)
   $ hg log -G -T '{node|short} {desc} {bookmarks}\n'
   @  83455f1f6049 aa
   |
@@ -186,7 +186,7 @@
   $ hg amend --fixup
   rebasing the children of 83455f1f6049.preamend
   rebasing 3:6ba7926ba204 "b"
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6ba7926ba204-9ac223ef-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/6ba7926ba204-9ac223ef-rebase.hg (glob)
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0889a0030a17-6bebea0c-preamend-backup.hg (glob)
   $ hg log -G -T '{node|short} {desc} {bookmarks}\n'
   o  455e4104f605 b
@@ -249,7 +249,7 @@
   (during histedit, use amend without --rebase)
   [255]
   $ hg commit --amend -m 'commit --amend message'
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a2329fab3fab-e6fb940f-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a2329fab3fab-e6fb940f-amend.hg (glob)
   $ hg log -G -T '{node|short} {desc} {bookmarks}\n'
   @  3166f3b5587d commit --amend message
   |
@@ -284,9 +284,9 @@
   nothing changed
   [1]
   $ hg amend --message foo
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f83a9508203-7d2a99ee-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f83a9508203-7d2a99ee-amend.hg (glob)
   $ hg amend -m bar
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/29272a1da891-35a82ce4-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/29272a1da891-35a82ce4-amend.hg (glob)
   $ hg amend
   nothing changed
   [1]
@@ -296,7 +296,7 @@
   $ echo new > new
   $ hg amend -A
   adding new
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/772f45f5a69d-90a7bd63-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/772f45f5a69d-90a7bd63-amend.hg (glob)
 
 Test that the extension disables itself when evolution is enabled
 
@@ -499,7 +499,7 @@
   $ hg amend --fixup
   rebasing the children of f2d4abddbbcd.preamend
   rebasing 2:4538525df7e2 "add c"
-  saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/4538525df7e2-0bcb0716-backup.hg (glob)
+  saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/4538525df7e2-0bcb0716-rebase.hg (glob)
   saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/7c3bad9141dc-81844e36-preamend-backup.hg (glob)
   $ hg log --template '{node|short} {desc}' --graph
   o  084836c39cc1 add c
@@ -516,7 +516,7 @@
   $ hg amend --rebase
   rebasing the children of 6d41fcaa1aa4.preamend
   rebasing 3:3a033d20b13a "add d"
-  saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/3a033d20b13a-c275a49d-backup.hg (glob)
+  saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/3a033d20b13a-c275a49d-rebase.hg (glob)
   saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/084836c39cc1-e86e0471-preamend-backup.hg (glob)
   $ hg log --template '{node|short} {desc}' --graph
   o  cc9fcfa87676 add d
diff --git a/tests/test-infinitepush-bundlestore.t b/tests/test-infinitepush-bundlestore.t
--- a/tests/test-infinitepush-bundlestore.t
+++ b/tests/test-infinitepush-bundlestore.t
@@ -278,7 +278,7 @@
   $ echo 1 > amend
   $ hg add amend
   $ hg ci --amend -m 'scratch amended commit'
-  saved backup bundle to $TESTTMP/client/.hg/strip-backup/6c10d49fe927-a7adb791-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/client/.hg/strip-backup/6c10d49fe927-a7adb791-amend.hg (glob)
   $ hg log -G -T '{desc} {phase} {bookmarks}'
   @  scratch amended commit draft scratch/mybranch
   |
diff --git a/tests/test-merge-conflictinfo.t b/tests/test-merge-conflictinfo.t
--- a/tests/test-merge-conflictinfo.t
+++ b/tests/test-merge-conflictinfo.t
@@ -329,7 +329,7 @@
   $ hg rebase -d 2 -s 1
   rebasing 1:ec87889f5f90 "source"
   merging file_newloc and file to file_newloc
-  saved backup bundle to $TESTTMP/cornercases/foo/foo/foo/foo/.hg/strip-backup/ec87889f5f90-e39a76b8-backup.hg (glob)
+  saved backup bundle to $TESTTMP/cornercases/foo/foo/foo/foo/.hg/strip-backup/ec87889f5f90-e39a76b8-rebase.hg (glob)
   $ hg up -q 2 # source
   $ cat file_newloc # Should follow:
   change
@@ -402,7 +402,7 @@
   $ hg rebase -d 2 -s 1
   rebasing 1:e6e7483a8950 "source"
   merging file and file_newloc to file_newloc
-  saved backup bundle to $TESTTMP/cornercases/foo/foo/foo/foo/.hg/strip-backup/e6e7483a8950-8e128ac2-backup.hg (glob)
+  saved backup bundle to $TESTTMP/cornercases/foo/foo/foo/foo/.hg/strip-backup/e6e7483a8950-8e128ac2-rebase.hg (glob)
   $ hg up 2
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ cat file_newloc
diff --git a/tests/test-remotefilelog-linknodes.t b/tests/test-remotefilelog-linknodes.t
--- a/tests/test-remotefilelog-linknodes.t
+++ b/tests/test-remotefilelog-linknodes.t
@@ -35,7 +35,7 @@
 
   $ hg rebase -d 1
   rebasing 2:0632994590a8 "xx" (tip)
-  saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/0632994590a8-0bc786d8-backup.hg (glob)
+  saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/0632994590a8-0bc786d8-rebase.hg (glob)
   $ hg log -f x --template "{node|short}\n"
   81deab2073bc
   b292c1e3311f
@@ -45,14 +45,14 @@
 
   $ hg rebase -d 0 -r 2
   rebasing 2:81deab2073bc "xx" (tip)
-  saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/81deab2073bc-80cb4fda-backup.hg (glob)
+  saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/81deab2073bc-80cb4fda-rebase.hg (glob)
   $ hg log -f x --template "{node|short}\n"
   b3fca10fb42d
   b292c1e3311f
 
   $ hg rebase -d 1 -r 2
   rebasing 2:b3fca10fb42d "xx" (tip)
-  saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/b3fca10fb42d-da73a0c7-backup.hg (glob)
+  saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/b3fca10fb42d-da73a0c7-rebase.hg (glob)
 
   $ cd ..
 
@@ -92,7 +92,7 @@
   rebasing 1:4549721d828f "xx2"
   note: rebase of 1:4549721d828f created no changes to commit
   rebasing 2:5ef6d97e851c "xxy"
-  saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/4549721d828f-b084e33c-backup.hg (glob)
+  saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/4549721d828f-b084e33c-rebase.hg (glob)
   $ hg log -f x --template '{node|short}\n'
   4ae8e31c85ef
   0632994590a8
diff --git a/tests/test-remotefilelog-local.t b/tests/test-remotefilelog-local.t
--- a/tests/test-remotefilelog-local.t
+++ b/tests/test-remotefilelog-local.t
@@ -106,7 +106,7 @@
 
   $ hg rebase -d tip
   rebasing 1:9abfe7bca547 "a"
-  saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/9abfe7bca547-8b11e5ff-backup.hg (glob)
+  saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/9abfe7bca547-8b11e5ff-rebase.hg (glob)
   3 files fetched over 2 fetches - (3 misses, 0.00% hit ratio) over *s (glob)
 
 # strip
diff --git a/tests/test-smartlog.t b/tests/test-smartlog.t
--- a/tests/test-smartlog.t
+++ b/tests/test-smartlog.t
@@ -73,7 +73,7 @@
 
 With commit info
   $ echo "hello" >c2 && hg ci --amend
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/db92053d5c83-f9f5e1aa-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/db92053d5c83-f9f5e1aa-amend.hg (glob)
   $ hg smartlog -T compact --commit-info
   @  5[tip][feature2]   05d10250273e   1970-01-01 00:00 +0000   test
   |    d
diff --git a/tests/test-sparse.t b/tests/test-sparse.t
--- a/tests/test-sparse.t
+++ b/tests/test-sparse.t
@@ -233,7 +233,7 @@
   $ hg commit -Aqm "add show2"
   $ hg rebase -d 1 --config extensions.rebase=
   rebasing 2:bdde55290160 "add show2" (tip)
-  saved backup bundle to $TESTTMP/myrepo/.hg/strip-backup/bdde55290160-216ed9c6-backup.hg (glob)
+  saved backup bundle to $TESTTMP/myrepo/.hg/strip-backup/bdde55290160-216ed9c6-rebase.hg (glob)
 
 Verify log --sparse only shows commits that affect the sparse checkout
 
diff --git a/tests/test-sqldirstate-shelve.t b/tests/test-sqldirstate-shelve.t
--- a/tests/test-sqldirstate-shelve.t
+++ b/tests/test-sqldirstate-shelve.t
@@ -596,7 +596,7 @@
   $ hg rebase -d 1 --config extensions.rebase=
   rebasing 2:323bfa07f744 "xyz" (tip)
   merging x
-  saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-backup.hg (glob)
+  saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-rebase.hg (glob)
   $ hg unshelve
   unshelving change 'default'
   rebasing shelved changes
diff --git a/tests/test-treemanifest-noflat.t b/tests/test-treemanifest-noflat.t
--- a/tests/test-treemanifest-noflat.t
+++ b/tests/test-treemanifest-noflat.t
@@ -80,4 +80,4 @@
       p1text = origself.revision(p1)
   
   rebasing 2:667a26a14261 "modify b" (tip)
-  saved backup bundle to $TESTTMP/client/.hg/strip-backup/667a26a14261-d769c687-backup.hg (glob)
+  saved backup bundle to $TESTTMP/client/.hg/strip-backup/667a26a14261-d769c687-rebase.hg (glob)
diff --git a/tests/test-treemanifest.t b/tests/test-treemanifest.t
--- a/tests/test-treemanifest.t
+++ b/tests/test-treemanifest.t
@@ -113,7 +113,7 @@
   $ hg rebase -d 0 -s '.^'
   rebasing 3:6a2476258ba5 "modify subdir/y"
   rebasing 4:f096b21e165f "modify subdir/y again" (tip)
-  saved backup bundle to $TESTTMP/client/.hg/strip-backup/6a2476258ba5-a90056a1-backup.hg (glob)
+  saved backup bundle to $TESTTMP/client/.hg/strip-backup/6a2476258ba5-a90056a1-rebase.hg (glob)
   $ hg log -r '.^::.' -T '{manifest}\n'
   3:0d05c20bb7eb
   4:8289b85c6a30
diff --git a/tests/test-tweakdefaults-ordering.t b/tests/test-tweakdefaults-ordering.t
--- a/tests/test-tweakdefaults-ordering.t
+++ b/tests/test-tweakdefaults-ordering.t
@@ -25,6 +25,6 @@
   $ hg bookmark C -t AB
   $ hg rebase
   rebasing 2:d5e255ef74f8 "c" (tip C)
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5e255ef74f8-7d2cc323-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5e255ef74f8-7d2cc323-rebase.hg (glob)
 
 
diff --git a/tests/test-tweakdefaults-remotenames.t b/tests/test-tweakdefaults-remotenames.t
--- a/tests/test-tweakdefaults-remotenames.t
+++ b/tests/test-tweakdefaults-remotenames.t
@@ -48,13 +48,13 @@
   searching for changes
   no changes found
   rebasing 3:3de6bbccf693 "foo" (tip bm)
-  saved backup bundle to $TESTTMP/clone/.hg/strip-backup/3de6bbccf693-0dce0663-backup.hg (glob)
+  saved backup bundle to $TESTTMP/clone/.hg/strip-backup/3de6bbccf693-0dce0663-rebase.hg (glob)
   $ hg pull --rebase --dest three
   pulling from $TESTTMP/repo (glob)
   searching for changes
   no changes found
   rebasing 3:54ac787ff1c5 "foo" (tip bm)
-  saved backup bundle to $TESTTMP/clone/.hg/strip-backup/54ac787ff1c5-4c2ca3a1-backup.hg (glob)
+  saved backup bundle to $TESTTMP/clone/.hg/strip-backup/54ac787ff1c5-4c2ca3a1-rebase.hg (glob)
 
 Test that hg pull --update aborts without --dest
   $ hg pull --update
@@ -116,7 +116,7 @@
   (run 'hg heads .' to see heads, 'hg merge' to merge)
   rebasing 4:ba0f83735c95 "d"
   merging d
-  saved backup bundle to $TESTTMP/clone/.hg/strip-backup/ba0f83735c95-ba455273-backup.hg (glob)
+  saved backup bundle to $TESTTMP/clone/.hg/strip-backup/ba0f83735c95-ba455273-rebase.hg (glob)
   $ hg log -G --all -T '{node|short} {bookmarks} {remotenames}'
   @  d6553cf01770
   |
diff --git a/tests/test-tweakdefaults.t b/tests/test-tweakdefaults.t
--- a/tests/test-tweakdefaults.t
+++ b/tests/test-tweakdefaults.t
@@ -92,7 +92,7 @@
   [255]
   $ hg rebase -d 2
   rebasing 1:7b4cb4e1674c "b"
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/7b4cb4e1674c-f22b5b1e-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/7b4cb4e1674c-f22b5b1e-rebase.hg (glob)
 
 Empty rebase with nooprebase=True (default) succeeds
 
diff --git a/tests/test-undo.t b/tests/test-undo.t
--- a/tests/test-undo.t
+++ b/tests/test-undo.t
@@ -62,7 +62,7 @@
   workingparent fcb754f6a51eaf982f66d0637b39f3d2e6b520d5 (no-eol)
   $ touch a3 && hg add a3
   $ hg commit --amend
-  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/db92053d5c83-e25f6bc1-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/db92053d5c83-e25f6bc1-amend.hg (glob)
   $ hg debugdata .hg/store/undolog/command.i 11
   commit\x00--amend (no-eol) (esc)