tests: Use test: URL prefix instead of baserock: throughout

Some tests already used test: and in order to be able to share the
scripts/setup-3rd-party-strata script they need to all use the same
prefix.

Using baserock: implies that we are using real code from Baserock,
so I picked test: because the tests only ever use mock morphologies
and no real code.

55 files changed, 207 insertions, 207 deletions

diff --git a/tests.branching/ambiguous-refs.script b/tests.branching/ambiguous-refs.script
index 3321a310..59d11fff 100755
--- a/tests.branching/ambiguous-refs.script
+++ b/tests.branching/ambiguous-refs.script
@@ -37,13 +37,13 @@ git commit --quiet -am "Rename hello-system"
 
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch baserock:morphs release
+"$SRCDIR/scripts/test-morph" branch test:morphs release
 
 # Create an extra ref to confuse any users of git show-ref
-cd release/baserock:morphs
+cd release/test:morphs
 git checkout --quiet -b alpha/master HEAD~1
 git checkout --quiet release
 
 # The petrify will fail if we resolved 'master' as 'alpha/master' by mistake.
-cd "$DATADIR/workspace/release/baserock:morphs"
+cd "$DATADIR/workspace/release/test:morphs"
 "$SRCDIR/scripts/test-morph" petrify
diff --git a/tests.branching/branch-cleans-up-on-failure.script b/tests.branching/branch-cleans-up-on-failure.script
index 4036046c..5e358fb9 100755
--- a/tests.branching/branch-cleans-up-on-failure.script
+++ b/tests.branching/branch-cleans-up-on-failure.script
@@ -23,6 +23,6 @@ cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
 
 # This will fail because we're trying to branch off a ref that doesn't exist
-"$SRCDIR/scripts/test-morph" branch baserock:morphs foo/bar invalid-ref || true
+"$SRCDIR/scripts/test-morph" branch test:morphs foo/bar invalid-ref || true
 
 [ ! -d "$DATADIR/workspace/foo" ]
diff --git a/tests.branching/branch-creates-new-system-branch-not-from-master.script b/tests.branching/branch-creates-new-system-branch-not-from-master.script
index 716dce8d..2ddc053a 100755
--- a/tests.branching/branch-creates-new-system-branch-not-from-master.script
+++ b/tests.branching/branch-creates-new-system-branch-not-from-master.script
@@ -21,7 +21,7 @@ set -eu
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
 
-"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch alfred
+"$SRCDIR/scripts/test-morph" branch test:morphs newbranch alfred
 
 echo "File tree:"
 "$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' |
@@ -29,8 +29,8 @@ echo "File tree:"
     grep -v 'cache/gits/file_[^/]*/'
 
 echo "Current branches:"
-"$SRCDIR/scripts/run-git-in" newbranch/baserock:morphs branch
+"$SRCDIR/scripts/run-git-in" newbranch/test:morphs branch
 
 echo "Current origin:"
-"$SRCDIR/scripts/run-git-in" newbranch/baserock:morphs remote show origin |
+"$SRCDIR/scripts/run-git-in" newbranch/test:morphs remote show origin |
     sed 's,\(TMP/workspace/\.morph/cache/gits/file_\).*_,\1,g'
diff --git a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout
index 27e4944a..948c5d19 100644
--- a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout
+++ b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout
@@ -6,12 +6,12 @@ d ./.morph/cache/gits
 d ./.morph/cache/gits/file_morphs
 d ./newbranch
 d ./newbranch/.morph-system-branch
-d ./newbranch/baserock:morphs
-d ./newbranch/baserock:morphs/.git
+d ./newbranch/test:morphs
+d ./newbranch/test:morphs/.git
 f ./newbranch/.morph-system-branch/config
-f ./newbranch/baserock:morphs/hello-stratum.morph
-f ./newbranch/baserock:morphs/hello-system.morph
-f ./newbranch/baserock:morphs/this.is.alfred
+f ./newbranch/test:morphs/hello-stratum.morph
+f ./newbranch/test:morphs/hello-system.morph
+f ./newbranch/test:morphs/this.is.alfred
 Current branches:
   alfred
 * newbranch
diff --git a/tests.branching/branch-creates-new-system-branch.script b/tests.branching/branch-creates-new-system-branch.script
index 86990824..35b50f7c 100755
--- a/tests.branching/branch-creates-new-system-branch.script
+++ b/tests.branching/branch-creates-new-system-branch.script
@@ -21,7 +21,7 @@ set -eu
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
 
-"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch
+"$SRCDIR/scripts/test-morph" branch test:morphs newbranch
 
 echo "File tree:"
 "$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' |
@@ -29,8 +29,8 @@ echo "File tree:"
     grep -v 'cache/gits/file_[^/]*/'
 
 echo "Current branches:"
-"$SRCDIR/scripts/run-git-in" newbranch/baserock:morphs branch
+"$SRCDIR/scripts/run-git-in" newbranch/test:morphs branch
 
 echo "Current origin:"
-"$SRCDIR/scripts/run-git-in" newbranch/baserock:morphs remote show origin |
+"$SRCDIR/scripts/run-git-in" newbranch/test:morphs remote show origin |
     sed 's,\(TMP/workspace/\.morph/cache/gits/file_\).*_,\1,g'
diff --git a/tests.branching/branch-creates-new-system-branch.stdout b/tests.branching/branch-creates-new-system-branch.stdout
index 5a4bd1d2..bc4bf568 100644
--- a/tests.branching/branch-creates-new-system-branch.stdout
+++ b/tests.branching/branch-creates-new-system-branch.stdout
@@ -6,11 +6,11 @@ d ./.morph/cache/gits
 d ./.morph/cache/gits/file_morphs
 d ./newbranch
 d ./newbranch/.morph-system-branch
-d ./newbranch/baserock:morphs
-d ./newbranch/baserock:morphs/.git
+d ./newbranch/test:morphs
+d ./newbranch/test:morphs/.git
 f ./newbranch/.morph-system-branch/config
-f ./newbranch/baserock:morphs/hello-stratum.morph
-f ./newbranch/baserock:morphs/hello-system.morph
+f ./newbranch/test:morphs/hello-stratum.morph
+f ./newbranch/test:morphs/hello-system.morph
 Current branches:
   master
 * newbranch
diff --git a/tests.branching/branch-fails-if-branch-exists.script b/tests.branching/branch-fails-if-branch-exists.script
index c9a18633..1ae92d30 100755
--- a/tests.branching/branch-fails-if-branch-exists.script
+++ b/tests.branching/branch-fails-if-branch-exists.script
@@ -28,11 +28,11 @@ cd "$DATADIR/workspace"
 # We create a valid branch inside the same prefix first so we can check it
 # doesn't get caught up in the deletion of the invalid branch directory
 
-"$SRCDIR/scripts/test-morph" branch baserock:morphs baserock/new-branch
+"$SRCDIR/scripts/test-morph" branch test:morphs baserock/new-branch
 
 [ -d "$DATADIR/workspace/baserock/new-branch" ]
 
-"$SRCDIR/scripts/test-morph" branch baserock:morphs \
+"$SRCDIR/scripts/test-morph" branch test:morphs \
     baserock/existing-branch || true
 
 [ -d "$DATADIR/workspace/baserock/new-branch" ]
diff --git a/tests.branching/branch-fails-if-branch-exists.stderr b/tests.branching/branch-fails-if-branch-exists.stderr
index c2ae2d9e..5b4bc943 100644
--- a/tests.branching/branch-fails-if-branch-exists.stderr
+++ b/tests.branching/branch-fails-if-branch-exists.stderr
@@ -1 +1 @@
-ERROR: branch baserock/existing-branch already exists in repository baserock:morphs
+ERROR: branch baserock/existing-branch already exists in repository test:morphs
diff --git a/tests.branching/branch-when-branchdir-exists-locally.script b/tests.branching/branch-when-branchdir-exists-locally.script
index a98f6401..318f1b37 100755
--- a/tests.branching/branch-when-branchdir-exists-locally.script
+++ b/tests.branching/branch-when-branchdir-exists-locally.script
@@ -23,5 +23,5 @@ cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
 
 mkdir newbranch
-"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch
+"$SRCDIR/scripts/test-morph" branch test:morphs newbranch
 
diff --git a/tests.branching/branch-works-anywhere.script b/tests.branching/branch-works-anywhere.script
index 19a00024..5198d7f4 100755
--- a/tests.branching/branch-works-anywhere.script
+++ b/tests.branching/branch-works-anywhere.script
@@ -22,7 +22,7 @@ cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
 
 # First, create a branch.
-"$SRCDIR/scripts/test-morph" branch baserock:morphs branch1
+"$SRCDIR/scripts/test-morph" branch test:morphs branch1
 
 echo "Workspace after creating the first branch:"
 "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' |
@@ -30,7 +30,7 @@ echo "Workspace after creating the first branch:"
     grep -v 'cache/gits/file_[^/]*/'
 
 # Now, create a nother branch from the workspace.
-"$SRCDIR/scripts/test-morph" branch baserock:morphs branch2
+"$SRCDIR/scripts/test-morph" branch test:morphs branch2
 
 echo "Workspace after creating the second branch:"
 "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' |
@@ -41,7 +41,7 @@ echo "Workspace after creating the second branch:"
 # should not be created in the working directory but in the
 # workspace directory.
 cd "$DATADIR/workspace/branch1"
-"$SRCDIR/scripts/test-morph" branch baserock:morphs branch3
+"$SRCDIR/scripts/test-morph" branch test:morphs branch3
 
 echo "Workspace after creating the third branch:"
 "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' |
@@ -51,8 +51,8 @@ echo "Workspace after creating the third branch:"
 # Now, go into the morphs repository of that third branch and
 # create a fourth system branch from in there. This, too, should
 # end up being created in the toplevel workspace directory.
-cd "$DATADIR/workspace/branch3/baserock:morphs"
-"$SRCDIR/scripts/test-morph" branch baserock:morphs branch4
+cd "$DATADIR/workspace/branch3/test:morphs"
+"$SRCDIR/scripts/test-morph" branch test:morphs branch4
 
 echo "Workspace after creating the fourth branch:"
 "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' |
diff --git a/tests.branching/branch-works-anywhere.stdout b/tests.branching/branch-works-anywhere.stdout
index 484fee45..3470a804 100644
--- a/tests.branching/branch-works-anywhere.stdout
+++ b/tests.branching/branch-works-anywhere.stdout
@@ -6,11 +6,11 @@ d ./.morph/cache/gits
 d ./.morph/cache/gits/file_morphs
 d ./branch1
 d ./branch1/.morph-system-branch
-d ./branch1/baserock:morphs
-d ./branch1/baserock:morphs/.git
+d ./branch1/test:morphs
+d ./branch1/test:morphs/.git
 f ./branch1/.morph-system-branch/config
-f ./branch1/baserock:morphs/hello-stratum.morph
-f ./branch1/baserock:morphs/hello-system.morph
+f ./branch1/test:morphs/hello-stratum.morph
+f ./branch1/test:morphs/hello-system.morph
 Workspace after creating the second branch:
 d .
 d ./.morph
@@ -19,18 +19,18 @@ d ./.morph/cache/gits
 d ./.morph/cache/gits/file_morphs
 d ./branch1
 d ./branch1/.morph-system-branch
-d ./branch1/baserock:morphs
-d ./branch1/baserock:morphs/.git
+d ./branch1/test:morphs
+d ./branch1/test:morphs/.git
 d ./branch2
 d ./branch2/.morph-system-branch
-d ./branch2/baserock:morphs
-d ./branch2/baserock:morphs/.git
+d ./branch2/test:morphs
+d ./branch2/test:morphs/.git
 f ./branch1/.morph-system-branch/config
-f ./branch1/baserock:morphs/hello-stratum.morph
-f ./branch1/baserock:morphs/hello-system.morph
+f ./branch1/test:morphs/hello-stratum.morph
+f ./branch1/test:morphs/hello-system.morph
 f ./branch2/.morph-system-branch/config
-f ./branch2/baserock:morphs/hello-stratum.morph
-f ./branch2/baserock:morphs/hello-system.morph
+f ./branch2/test:morphs/hello-stratum.morph
+f ./branch2/test:morphs/hello-system.morph
 Workspace after creating the third branch:
 d .
 d ./.morph
@@ -39,25 +39,25 @@ d ./.morph/cache/gits
 d ./.morph/cache/gits/file_morphs
 d ./branch1
 d ./branch1/.morph-system-branch
-d ./branch1/baserock:morphs
-d ./branch1/baserock:morphs/.git
+d ./branch1/test:morphs
+d ./branch1/test:morphs/.git
 d ./branch2
 d ./branch2/.morph-system-branch
-d ./branch2/baserock:morphs
-d ./branch2/baserock:morphs/.git
+d ./branch2/test:morphs
+d ./branch2/test:morphs/.git
 d ./branch3
 d ./branch3/.morph-system-branch
-d ./branch3/baserock:morphs
-d ./branch3/baserock:morphs/.git
+d ./branch3/test:morphs
+d ./branch3/test:morphs/.git
 f ./branch1/.morph-system-branch/config
-f ./branch1/baserock:morphs/hello-stratum.morph
-f ./branch1/baserock:morphs/hello-system.morph
+f ./branch1/test:morphs/hello-stratum.morph
+f ./branch1/test:morphs/hello-system.morph
 f ./branch2/.morph-system-branch/config
-f ./branch2/baserock:morphs/hello-stratum.morph
-f ./branch2/baserock:morphs/hello-system.morph
+f ./branch2/test:morphs/hello-stratum.morph
+f ./branch2/test:morphs/hello-system.morph
 f ./branch3/.morph-system-branch/config
-f ./branch3/baserock:morphs/hello-stratum.morph
-f ./branch3/baserock:morphs/hello-system.morph
+f ./branch3/test:morphs/hello-stratum.morph
+f ./branch3/test:morphs/hello-system.morph
 Workspace after creating the fourth branch:
 d .
 d ./.morph
@@ -66,29 +66,29 @@ d ./.morph/cache/gits
 d ./.morph/cache/gits/file_morphs
 d ./branch1
 d ./branch1/.morph-system-branch
-d ./branch1/baserock:morphs
-d ./branch1/baserock:morphs/.git
+d ./branch1/test:morphs
+d ./branch1/test:morphs/.git
 d ./branch2
 d ./branch2/.morph-system-branch
-d ./branch2/baserock:morphs
-d ./branch2/baserock:morphs/.git
+d ./branch2/test:morphs
+d ./branch2/test:morphs/.git
 d ./branch3
 d ./branch3/.morph-system-branch
-d ./branch3/baserock:morphs
-d ./branch3/baserock:morphs/.git
+d ./branch3/test:morphs
+d ./branch3/test:morphs/.git
 d ./branch4
 d ./branch4/.morph-system-branch
-d ./branch4/baserock:morphs
-d ./branch4/baserock:morphs/.git
+d ./branch4/test:morphs
+d ./branch4/test:morphs/.git
 f ./branch1/.morph-system-branch/config
-f ./branch1/baserock:morphs/hello-stratum.morph
-f ./branch1/baserock:morphs/hello-system.morph
+f ./branch1/test:morphs/hello-stratum.morph
+f ./branch1/test:morphs/hello-system.morph
 f ./branch2/.morph-system-branch/config
-f ./branch2/baserock:morphs/hello-stratum.morph
-f ./branch2/baserock:morphs/hello-system.morph
+f ./branch2/test:morphs/hello-stratum.morph
+f ./branch2/test:morphs/hello-system.morph
 f ./branch3/.morph-system-branch/config
-f ./branch3/baserock:morphs/hello-stratum.morph
-f ./branch3/baserock:morphs/hello-system.morph
+f ./branch3/test:morphs/hello-stratum.morph
+f ./branch3/test:morphs/hello-system.morph
 f ./branch4/.morph-system-branch/config
-f ./branch4/baserock:morphs/hello-stratum.morph
-f ./branch4/baserock:morphs/hello-system.morph
+f ./branch4/test:morphs/hello-stratum.morph
+f ./branch4/test:morphs/hello-system.morph
diff --git a/tests.branching/checkout-cleans-up-on-failure.script b/tests.branching/checkout-cleans-up-on-failure.script
index b2a59e6c..fe80770f 100755
--- a/tests.branching/checkout-cleans-up-on-failure.script
+++ b/tests.branching/checkout-cleans-up-on-failure.script
@@ -22,6 +22,6 @@ set -eu
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
 
-"$SRCDIR/scripts/test-morph" checkout baserock:morphs i/do/not/exist || true
+"$SRCDIR/scripts/test-morph" checkout test:morphs i/do/not/exist || true
 
 [ ! -d "$DATADIR/workspace/i" ]
diff --git a/tests.branching/checkout-existing-branch.script b/tests.branching/checkout-existing-branch.script
index 0edf0222..310b9f42 100755
--- a/tests.branching/checkout-existing-branch.script
+++ b/tests.branching/checkout-existing-branch.script
@@ -15,7 +15,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
-# Verify that "morph checkout baserock:morphs master" works.
+# Verify that "morph checkout test:morphs master" works.
 
 
 set -eu
@@ -23,7 +23,7 @@ set -eu
 
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" checkout baserock:morphs master
+"$SRCDIR/scripts/test-morph" checkout test:morphs master
 
 echo "File tree:"
 "$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' |
@@ -31,4 +31,4 @@ echo "File tree:"
     grep -v 'cache/gits/file_[^/]*/'
 
 echo "Current branches:"
-"$SRCDIR/scripts/run-git-in" master/baserock:morphs branch
+"$SRCDIR/scripts/run-git-in" master/test:morphs branch
diff --git a/tests.branching/checkout-existing-branch.stdout b/tests.branching/checkout-existing-branch.stdout
index 30f48b68..60fca613 100644
--- a/tests.branching/checkout-existing-branch.stdout
+++ b/tests.branching/checkout-existing-branch.stdout
@@ -6,10 +6,10 @@ d ./.morph/cache/gits
 d ./.morph/cache/gits/file_morphs
 d ./master
 d ./master/.morph-system-branch
-d ./master/baserock:morphs
-d ./master/baserock:morphs/.git
+d ./master/test:morphs
+d ./master/test:morphs/.git
 f ./master/.morph-system-branch/config
-f ./master/baserock:morphs/hello-stratum.morph
-f ./master/baserock:morphs/hello-system.morph
+f ./master/test:morphs/hello-stratum.morph
+f ./master/test:morphs/hello-system.morph
 Current branches:
 * master
diff --git a/tests.branching/checkout-works-anywhere.script b/tests.branching/checkout-works-anywhere.script
index 73e30498..c7d046e4 100755
--- a/tests.branching/checkout-works-anywhere.script
+++ b/tests.branching/checkout-works-anywhere.script
@@ -22,7 +22,7 @@ cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
 
 # First, check out the master branch from the workspace directory.
-"$SRCDIR/scripts/test-morph" checkout baserock:morphs master
+"$SRCDIR/scripts/test-morph" checkout test:morphs master
 
 echo "Workspace after checking out master from the workspace directory:"
 "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' |
@@ -38,9 +38,9 @@ cd workspace
 
 # This time, create a new branch and check out the master branch
 # from within that branch.
-"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch
-cd newbranch/baserock:morphs
-"$SRCDIR/scripts/test-morph" checkout baserock:morphs master
+"$SRCDIR/scripts/test-morph" branch test:morphs newbranch
+cd newbranch/test:morphs
+"$SRCDIR/scripts/test-morph" checkout test:morphs master
 
 echo "Workspace after checking out master from within a new branch:"
 "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' |
diff --git a/tests.branching/checkout-works-anywhere.stdout b/tests.branching/checkout-works-anywhere.stdout
index e8171473..6e82072a 100644
--- a/tests.branching/checkout-works-anywhere.stdout
+++ b/tests.branching/checkout-works-anywhere.stdout
@@ -6,11 +6,11 @@ d ./.morph/cache/gits
 d ./.morph/cache/gits/file_morphs
 d ./master
 d ./master/.morph-system-branch
-d ./master/baserock:morphs
-d ./master/baserock:morphs/.git
+d ./master/test:morphs
+d ./master/test:morphs/.git
 f ./master/.morph-system-branch/config
-f ./master/baserock:morphs/hello-stratum.morph
-f ./master/baserock:morphs/hello-system.morph
+f ./master/test:morphs/hello-stratum.morph
+f ./master/test:morphs/hello-system.morph
 Workspace after checking out master from within a new branch:
 d .
 d ./.morph
@@ -19,15 +19,15 @@ d ./.morph/cache/gits
 d ./.morph/cache/gits/file_morphs
 d ./master
 d ./master/.morph-system-branch
-d ./master/baserock:morphs
-d ./master/baserock:morphs/.git
+d ./master/test:morphs
+d ./master/test:morphs/.git
 d ./newbranch
 d ./newbranch/.morph-system-branch
-d ./newbranch/baserock:morphs
-d ./newbranch/baserock:morphs/.git
+d ./newbranch/test:morphs
+d ./newbranch/test:morphs/.git
 f ./master/.morph-system-branch/config
-f ./master/baserock:morphs/hello-stratum.morph
-f ./master/baserock:morphs/hello-system.morph
+f ./master/test:morphs/hello-stratum.morph
+f ./master/test:morphs/hello-system.morph
 f ./newbranch/.morph-system-branch/config
-f ./newbranch/baserock:morphs/hello-stratum.morph
-f ./newbranch/baserock:morphs/hello-system.morph
+f ./newbranch/test:morphs/hello-stratum.morph
+f ./newbranch/test:morphs/hello-system.morph
diff --git a/tests.branching/edit-checkouts-existing-chunk.script b/tests.branching/edit-checkouts-existing-chunk.script
index 5e0d7bc9..814b128f 100755
--- a/tests.branching/edit-checkouts-existing-chunk.script
+++ b/tests.branching/edit-checkouts-existing-chunk.script
@@ -23,7 +23,7 @@ set -eu
 # Checkout the master system branch.
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" checkout baserock:morphs alfred
+"$SRCDIR/scripts/test-morph" checkout test:morphs alfred
 
 # Edit the hello chunk in alfred.
 cd "alfred"
@@ -34,4 +34,4 @@ echo "Current branches:"
 
 echo
 echo "Files in hello:"
-ls "$DATADIR/workspace/alfred/baserock:hello"
+ls "$DATADIR/workspace/alfred/test:hello"
diff --git a/tests.branching/edit-checkouts-existing-chunk.stdout b/tests.branching/edit-checkouts-existing-chunk.stdout
index 77f8fcd7..acfd1c0a 100644
--- a/tests.branching/edit-checkouts-existing-chunk.stdout
+++ b/tests.branching/edit-checkouts-existing-chunk.stdout
@@ -1,8 +1,8 @@
 Current branches:
-baserock:morphs
+test:morphs
 * alfred
 
-baserock:hello
+test:hello
 * alfred
   master
 
diff --git a/tests.branching/edit-clones-chunk.script b/tests.branching/edit-clones-chunk.script
index aef40807..27440816 100755
--- a/tests.branching/edit-clones-chunk.script
+++ b/tests.branching/edit-clones-chunk.script
@@ -23,7 +23,7 @@ set -eu
 # Create system branch.
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch
+"$SRCDIR/scripts/test-morph" branch test:morphs newbranch
 
 # Edit chunk.
 "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello
diff --git a/tests.branching/edit-clones-chunk.stdout b/tests.branching/edit-clones-chunk.stdout
index ea7133f5..b694233b 100644
--- a/tests.branching/edit-clones-chunk.stdout
+++ b/tests.branching/edit-clones-chunk.stdout
@@ -1,14 +1,14 @@
 Current branches:
-baserock:morphs
+test:morphs
   master
 * newbranch
 
-baserock:hello
+test:hello
   master
 * newbranch
 
 Current origins:
-baserock:morphs
+test:morphs
 * remote origin
   Fetch URL: file://TMP/morphs
   Push  URL: file://TMP/morphs
@@ -21,7 +21,7 @@ baserock:morphs
   Local ref configured for 'git push':
     master pushes to master (up to date)
 
-baserock:hello
+test:hello
 * remote origin
   Fetch URL: file://TMP/hello
   Push  URL: file://TMP/hello
diff --git a/tests.branching/edit-handles-submodules.script b/tests.branching/edit-handles-submodules.script
index 6e781cbe..bbe86c1f 100755
--- a/tests.branching/edit-handles-submodules.script
+++ b/tests.branching/edit-handles-submodules.script
@@ -21,11 +21,11 @@ set -eu
 
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch
+"$SRCDIR/scripts/test-morph" branch test:morphs newbranch
 
 # Submodules should be set up automatically
 "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello
 
-cd "$DATADIR/workspace/newbranch/baserock:hello"
+cd "$DATADIR/workspace/newbranch/test:hello"
 [ -e foolib/README ]
 
diff --git a/tests.branching/edit-handles-submodules.setup b/tests.branching/edit-handles-submodules.setup
index 1b3f3198..cb61ad66 100755
--- a/tests.branching/edit-handles-submodules.setup
+++ b/tests.branching/edit-handles-submodules.setup
@@ -34,7 +34,7 @@ git commit -m "Use Foolib submodule"
 cat <<EOF > "$DATADIR/hello/.gitmodules"
 [submodule "foolib"]
         path = foolib
-        url = baserock:foolib
+        url = test:foolib
 EOF
 git add .gitmodules
-git commit -m "Use Foolib from baserock: prefix"
+git commit -m "Use Foolib from test: prefix"
diff --git a/tests.branching/edit-updates-stratum.script b/tests.branching/edit-updates-stratum.script
index f95526e2..d43fd360 100755
--- a/tests.branching/edit-updates-stratum.script
+++ b/tests.branching/edit-updates-stratum.script
@@ -30,10 +30,10 @@ fi
 # Create system branch.
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch
+"$SRCDIR/scripts/test-morph" branch test:morphs newbranch
 
 # Edit chunk.
 "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello
 
 # See what effect the editing had.
-"$SRCDIR/scripts/run-git-in" "newbranch/baserock:morphs" diff
+"$SRCDIR/scripts/run-git-in" "newbranch/test:morphs" diff
diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout
index 260ac9a6..1e239196 100644
--- a/tests.branching/edit-updates-stratum.stdout
+++ b/tests.branching/edit-updates-stratum.stdout
@@ -1,24 +1,24 @@
 diff --git a/hello-stratum.morph b/hello-stratum.morph
-index 006a96c..68fcbff 100644
+index 3b7be17..febfa60 100644
 --- a/hello-stratum.morph
 +++ b/hello-stratum.morph
 @@ -5,7 +5,7 @@
          {
              "name": "hello",
-             "repo": "baserock:hello",
+             "repo": "test:hello",
 -            "ref": "master",
 +            "ref": "newbranch",
              "build-depends": []
          }
      ]
 diff --git a/hello-system.morph b/hello-system.morph
-index 1a33ed6..9cca1bf 100644
+index f3f64b4..99516e3 100644
 --- a/hello-system.morph
 +++ b/hello-system.morph
 @@ -8,7 +8,7 @@
          {
              "morph": "hello-stratum",
-             "repo": "baserock:morphs",
+             "repo": "test:morphs",
 -            "ref": "master"
 +            "ref": "newbranch"
          }
diff --git a/tests.branching/edit-uses-ref-from-stratum.script b/tests.branching/edit-uses-ref-from-stratum.script
index 5b1f5137..f62dd73e 100755
--- a/tests.branching/edit-uses-ref-from-stratum.script
+++ b/tests.branching/edit-uses-ref-from-stratum.script
@@ -23,9 +23,9 @@ set -eu
 # Create system branch.
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch
+"$SRCDIR/scripts/test-morph" branch test:morphs newbranch
 
 # Edit chunk.
 "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello
 
-"$SRCDIR/scripts/run-git-in" "newbranch/baserock:hello" branch
+"$SRCDIR/scripts/run-git-in" "newbranch/test:hello" branch
diff --git a/tests.branching/edit-works-after-branch-root-was-renamed.script b/tests.branching/edit-works-after-branch-root-was-renamed.script
index 2f0d1588..b6eaa729 100755
--- a/tests.branching/edit-works-after-branch-root-was-renamed.script
+++ b/tests.branching/edit-works-after-branch-root-was-renamed.script
@@ -23,10 +23,10 @@ set -eu
 cd "$DATADIR/workspace"
 
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" checkout baserock:morphs master
+"$SRCDIR/scripts/test-morph" checkout test:morphs master
 
 cd "$DATADIR/workspace/master"
-mv baserock:morphs my-renamed-morphs
+mv test:morphs my-renamed-morphs
 
 "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello
 
diff --git a/tests.branching/edit-works-after-branch-root-was-renamed.stdout b/tests.branching/edit-works-after-branch-root-was-renamed.stdout
index b544d08a..549c1c34 100644
--- a/tests.branching/edit-works-after-branch-root-was-renamed.stdout
+++ b/tests.branching/edit-works-after-branch-root-was-renamed.stdout
@@ -6,11 +6,11 @@ d ./.morph/cache/gits/file_hello
 d ./.morph/cache/gits/file_morphs
 d ./master
 d ./master/.morph-system-branch
-d ./master/baserock:hello
-d ./master/baserock:hello/.git
 d ./master/my-renamed-morphs
 d ./master/my-renamed-morphs/.git
+d ./master/test:hello
+d ./master/test:hello/.git
 f ./master/.morph-system-branch/config
-f ./master/baserock:hello/hello.morph
 f ./master/my-renamed-morphs/hello-stratum.morph
 f ./master/my-renamed-morphs/hello-system.morph
+f ./master/test:hello/hello.morph
diff --git a/tests.branching/foreach-handles-command-failure.script b/tests.branching/foreach-handles-command-failure.script
index 25b96cf6..00d27659 100755
--- a/tests.branching/foreach-handles-command-failure.script
+++ b/tests.branching/foreach-handles-command-failure.script
@@ -22,7 +22,7 @@ set -eu
 
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" checkout baserock:morphs master
+"$SRCDIR/scripts/test-morph" checkout test:morphs master
 "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello
 
 "$SRCDIR/scripts/test-morph" foreach git remote update non-existant-remote
diff --git a/tests.branching/foreach-handles-command-failure.stderr b/tests.branching/foreach-handles-command-failure.stderr
index 72942b89..c3085343 100644
--- a/tests.branching/foreach-handles-command-failure.stderr
+++ b/tests.branching/foreach-handles-command-failure.stderr
@@ -1 +1 @@
-ERROR: Command failed at repo baserock:morphs: git remote update non-existant-remote
+ERROR: Command failed at repo test:morphs: git remote update non-existant-remote
diff --git a/tests.branching/foreach-handles-command-failure.stdout b/tests.branching/foreach-handles-command-failure.stdout
index 2db791fc..6bb791b3 100644
--- a/tests.branching/foreach-handles-command-failure.stdout
+++ b/tests.branching/foreach-handles-command-failure.stdout
@@ -1,2 +1,2 @@
-baserock:morphs
+test:morphs
 fatal: No such remote or remote group: non-existant-remote
diff --git a/tests.branching/morph-repository-stored-in-cloned-repositories.script b/tests.branching/morph-repository-stored-in-cloned-repositories.script
index 5f5efa9e..68edbad6 100755
--- a/tests.branching/morph-repository-stored-in-cloned-repositories.script
+++ b/tests.branching/morph-repository-stored-in-cloned-repositories.script
@@ -24,18 +24,18 @@ set -eu
 cd "$DATADIR/workspace"
 
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch
+"$SRCDIR/scripts/test-morph" branch test:morphs newbranch
 
 echo "morph.repository in branch root repository:"
-cd "$DATADIR/workspace/newbranch/baserock:morphs"
+cd "$DATADIR/workspace/newbranch/test:morphs"
 git config morph.repository
 echo
 
 cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" checkout baserock:morphs master
+"$SRCDIR/scripts/test-morph" checkout test:morphs master
 
 echo "morph.repository in branch root repository of a checkout:"
-cd "$DATADIR/workspace/master/baserock:morphs"
+cd "$DATADIR/workspace/master/test:morphs"
 git config morph.repository
 echo
 
@@ -43,5 +43,5 @@ cd "$DATADIR/workspace/master"
 "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello
 
 echo "morph.repository of an edited repository:"
-cd "$DATADIR/workspace/master/baserock:hello"
+cd "$DATADIR/workspace/master/test:hello"
 git config morph.repository
diff --git a/tests.branching/morph-repository-stored-in-cloned-repositories.stdout b/tests.branching/morph-repository-stored-in-cloned-repositories.stdout
index b57f0c1f..eadcdd19 100644
--- a/tests.branching/morph-repository-stored-in-cloned-repositories.stdout
+++ b/tests.branching/morph-repository-stored-in-cloned-repositories.stdout
@@ -1,8 +1,8 @@
 morph.repository in branch root repository:
-baserock:morphs
+test:morphs
 
 morph.repository in branch root repository of a checkout:
-baserock:morphs
+test:morphs
 
 morph.repository of an edited repository:
-baserock:hello
+test:hello
diff --git a/tests.branching/petrify-no-double-petrify.script b/tests.branching/petrify-no-double-petrify.script
index 9fc00d39..56326cdc 100755
--- a/tests.branching/petrify-no-double-petrify.script
+++ b/tests.branching/petrify-no-double-petrify.script
@@ -31,9 +31,9 @@ fi
 
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch baserock:morphs test/petrify
+"$SRCDIR/scripts/test-morph" branch test:morphs test/petrify
 
-cd test/petrify/baserock:morphs
+cd test/petrify/test:morphs
 "$SRCDIR/scripts/test-morph" petrify
 "$SRCDIR/scripts/test-morph" petrify
 "$SRCDIR/scripts/test-morph" petrify
diff --git a/tests.branching/petrify-no-double-petrify.stdout b/tests.branching/petrify-no-double-petrify.stdout
index 4aa2b2ea..87561c14 100644
--- a/tests.branching/petrify-no-double-petrify.stdout
+++ b/tests.branching/petrify-no-double-petrify.stdout
@@ -4,7 +4,7 @@
     "chunks": [
         {
             "name": "hello",
-            "repo": "baserock:hello",
+            "repo": "test:hello",
             "ref": "f4d032b42c0134e67bdf19a43fa99072493667d7",
             "build-depends": [],
             "unpetrify-ref": "master"
diff --git a/tests.branching/petrify.script b/tests.branching/petrify.script
index c1828bf3..a74ae6ba 100755
--- a/tests.branching/petrify.script
+++ b/tests.branching/petrify.script
@@ -33,9 +33,9 @@ fi
 
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch baserock:morphs test/petrify master
+"$SRCDIR/scripts/test-morph" branch test:morphs test/petrify master
 
-cd test/petrify/baserock:morphs
+cd test/petrify/test:morphs
 "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum goodbye
 
 "$SRCDIR/scripts/test-morph" petrify
diff --git a/tests.branching/petrify.stdout b/tests.branching/petrify.stdout
index 6219c84e..d2126831 100644
--- a/tests.branching/petrify.stdout
+++ b/tests.branching/petrify.stdout
@@ -5,14 +5,14 @@ Petrified:
     "chunks": [
         {
             "name": "hello",
-            "repo": "baserock:hello",
+            "repo": "test:hello",
             "ref": "f4d032b42c0134e67bdf19a43fa99072493667d7",
             "build-depends": [],
             "unpetrify-ref": "master"
         },
         {
             "name": "goodbye",
-            "repo": "baserock:goodbye",
+            "repo": "test:goodbye",
             "ref": "test/petrify",
             "build-depends": []
         }
@@ -26,13 +26,13 @@ Unpetrified:
     "chunks": [
         {
             "name": "hello",
-            "repo": "baserock:hello",
+            "repo": "test:hello",
             "ref": "master",
             "build-depends": []
         },
         {
             "name": "goodbye",
-            "repo": "baserock:goodbye",
+            "repo": "test:goodbye",
             "ref": "test/petrify",
             "build-depends": []
         }
diff --git a/tests.branching/setup b/tests.branching/setup
index f075e7b1..c0dfd969 100755
--- a/tests.branching/setup
+++ b/tests.branching/setup
@@ -29,7 +29,7 @@ source "$SRCDIR/scripts/fix-committer-info"
 # Create a morph configuration file
 cat <<EOF > "$DATADIR/morph.conf"
 [config]
-repo-alias = baserock=file://$DATADIR/%s#file://$DATADIR/%s
+repo-alias = test=file://$DATADIR/%s#file://$DATADIR/%s
 cachedir = $DATADIR/workspace/.morph/cache
 log = $DATADIR/morph.log
 keep-path = true
@@ -58,7 +58,7 @@ cat <<EOF > "$DATADIR/morphs/hello-system.morph"
     "strata": [
         {
             "morph": "hello-stratum",
-            "repo": "baserock:morphs",
+            "repo": "test:morphs",
             "ref": "master"
         }
     ]
@@ -72,7 +72,7 @@ cat <<EOF > "$DATADIR/morphs/hello-stratum.morph"
     "chunks": [
         {
             "name": "hello",
-            "repo": "baserock:hello",
+            "repo": "test:hello",
             "ref": "master",
             "build-depends": []
         }
diff --git a/tests.branching/setup-second-chunk b/tests.branching/setup-second-chunk
index 9f7aa419..0bbb0e27 100755
--- a/tests.branching/setup-second-chunk
+++ b/tests.branching/setup-second-chunk
@@ -50,13 +50,13 @@ cat <<EOF > hello-stratum.morph
     "chunks": [
         {
             "name": "hello",
-            "repo": "baserock:hello",
+            "repo": "test:hello",
             "ref": "master",
             "build-depends": []
         },
         {
             "name": "goodbye",
-            "repo": "baserock:goodbye",
+            "repo": "test:goodbye",
             "ref": "master",
             "build-depends": []
         }
diff --git a/tests.branching/show-branch-root-in-branched-branch.script b/tests.branching/show-branch-root-in-branched-branch.script
index aeb06bfc..c1798d78 100755
--- a/tests.branching/show-branch-root-in-branched-branch.script
+++ b/tests.branching/show-branch-root-in-branched-branch.script
@@ -24,7 +24,7 @@ set -eu
 # Create a workspace and branch.
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch baserock:morphs testbranch
+"$SRCDIR/scripts/test-morph" branch test:morphs testbranch
 
 # Try to print the branch root repository.
 "$SRCDIR/scripts/test-morph" show-branch-root
diff --git a/tests.branching/show-branch-root-in-branched-branch.stdout b/tests.branching/show-branch-root-in-branched-branch.stdout
index 53a8bc43..b2804d56 100644
--- a/tests.branching/show-branch-root-in-branched-branch.stdout
+++ b/tests.branching/show-branch-root-in-branched-branch.stdout
@@ -1 +1 @@
-baserock:morphs
+test:morphs
diff --git a/tests.branching/show-branch-root-in-checked-out-branch.script b/tests.branching/show-branch-root-in-checked-out-branch.script
index ce76cc7b..dfc08edb 100755
--- a/tests.branching/show-branch-root-in-checked-out-branch.script
+++ b/tests.branching/show-branch-root-in-checked-out-branch.script
@@ -24,7 +24,7 @@ set -eu
 # Create a workspace and branch.
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" checkout baserock:morphs master
+"$SRCDIR/scripts/test-morph" checkout test:morphs master
 
 # Try to print the branch root repository.
 "$SRCDIR/scripts/test-morph" show-branch-root
diff --git a/tests.branching/show-branch-root-in-checked-out-branch.stdout b/tests.branching/show-branch-root-in-checked-out-branch.stdout
index 53a8bc43..b2804d56 100644
--- a/tests.branching/show-branch-root-in-checked-out-branch.stdout
+++ b/tests.branching/show-branch-root-in-checked-out-branch.stdout
@@ -1 +1 @@
-baserock:morphs
+test:morphs
diff --git a/tests.branching/show-system-branch-fails-outside-workspace.script b/tests.branching/show-system-branch-fails-outside-workspace.script
index 5cd3bb98..228e03d9 100755
--- a/tests.branching/show-system-branch-fails-outside-workspace.script
+++ b/tests.branching/show-system-branch-fails-outside-workspace.script
@@ -24,7 +24,7 @@ set -eu
 # Create a workspace and branch.
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch baserock:morphs testbranch
+"$SRCDIR/scripts/test-morph" branch test:morphs testbranch
 
 # Leave the workspace.
 cd ..
diff --git a/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.script b/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.script
index 2383deb9..58143526 100755
--- a/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.script
+++ b/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.script
@@ -24,8 +24,8 @@ set -eu
 # Create a workspace and two system branches
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch baserock:morphs first/branch
-"$SRCDIR/scripts/test-morph" branch baserock:morphs second/branch
+"$SRCDIR/scripts/test-morph" branch test:morphs first/branch
+"$SRCDIR/scripts/test-morph" branch test:morphs second/branch
 
 # Try to find out the branch from the workspace directory.
 cd "$DATADIR/workspace"
diff --git a/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.script b/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.script
index eb565b91..1b4af8bd 100755
--- a/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.script
+++ b/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.script
@@ -24,7 +24,7 @@ set -eu
 # Create a workspace and a system branch.
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch baserock:morphs first/branch
+"$SRCDIR/scripts/test-morph" branch test:morphs first/branch
 
 # Show the branch even when outside the branch.
 cd "$DATADIR/workspace"
diff --git a/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script b/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script
index f4abc8ea..c19e4093 100755
--- a/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script
+++ b/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script
@@ -24,8 +24,8 @@ set -eu
 # Create a workspace and two system branches.
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch baserock:morphs first/branch
-"$SRCDIR/scripts/test-morph" branch baserock:morphs second/branch
+"$SRCDIR/scripts/test-morph" branch test:morphs first/branch
+"$SRCDIR/scripts/test-morph" branch test:morphs second/branch
 
 # Create a few subdirectories in the first branch.
 mkdir -p "$DATADIR/workspace/first/branch/foo"
diff --git a/tests.branching/status-in-clean-branch.script b/tests.branching/status-in-clean-branch.script
index c102d287..ec496128 100755
--- a/tests.branching/status-in-clean-branch.script
+++ b/tests.branching/status-in-clean-branch.script
@@ -21,6 +21,6 @@ set -eu
 
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init .
-"$SRCDIR/scripts/test-morph" branch baserock:morphs test
+"$SRCDIR/scripts/test-morph" branch test:morphs test
 
 "$SRCDIR/scripts/test-morph" status
diff --git a/tests.branching/status-in-clean-branch.stdout b/tests.branching/status-in-clean-branch.stdout
index d8468519..684ab9c9 100644
--- a/tests.branching/status-in-clean-branch.stdout
+++ b/tests.branching/status-in-clean-branch.stdout
@@ -1,3 +1,3 @@
-On branch test, root baserock:morphs
+On branch test, root test:morphs
 
 No repos have outstanding changes.
diff --git a/tests.branching/status-in-dirty-branch.script b/tests.branching/status-in-dirty-branch.script
index beb58ced..18aaf61e 100755
--- a/tests.branching/status-in-dirty-branch.script
+++ b/tests.branching/status-in-dirty-branch.script
@@ -22,13 +22,13 @@ set -eu
 . "$SRCDIR/scripts/setup-3rd-party-strata"
 
 cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" branch baserock:morphs test
+"$SRCDIR/scripts/test-morph" branch test:morphs branch1
 
 # Make the branch have some interesting changes and pitfalls
-cd test
+cd branch1
 "$SRCDIR/scripts/test-morph" edit hello-system stratum2 hello
 
-cd baserock:stratum2-hello
+cd test:stratum2-hello
 git checkout -q master
 
 cd ..
diff --git a/tests.branching/status-in-dirty-branch.stdout b/tests.branching/status-in-dirty-branch.stdout
index a81aa765..bee47eaa 100644
--- a/tests.branching/status-in-dirty-branch.stdout
+++ b/tests.branching/status-in-dirty-branch.stdout
@@ -1,5 +1,5 @@
-On branch test, root baserock:morphs
-    baserock:morphs: uncommitted changes
-    baserock:external-strata: uncommitted changes
-    baserock:stratum2-hello: unexpected ref checked out "master"
-    TMP/workspace/test/red-herring: not part of system branch
+On branch branch1, root test:morphs
+    test:morphs: uncommitted changes
+    TMP/workspace/branch1/red-herring: not part of system branch
+    test:external-strata: uncommitted changes
+    test:stratum2-hello: unexpected ref checked out "master"
diff --git a/tests.branching/status-in-workspace.script b/tests.branching/status-in-workspace.script
index 5e13b433..63014aee 100755
--- a/tests.branching/status-in-workspace.script
+++ b/tests.branching/status-in-workspace.script
@@ -21,9 +21,9 @@ set -eu
 
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init .
-"$SRCDIR/scripts/test-morph" checkout baserock:morphs master
-"$SRCDIR/scripts/test-morph" branch baserock:morphs a/b/c/d/e/foo
-"$SRCDIR/scripts/test-morph" branch baserock:morphs a/b/c/d/e/bar
+"$SRCDIR/scripts/test-morph" checkout test:morphs master
+"$SRCDIR/scripts/test-morph" branch test:morphs a/b/c/d/e/foo
+"$SRCDIR/scripts/test-morph" branch test:morphs a/b/c/d/e/bar
 mkdir a/b/c/red-herring
 
 "$SRCDIR/scripts/test-morph" status
diff --git a/tests.branching/workflow-petrify.script b/tests.branching/workflow-petrify.script
index ac8b233e..a73e17db 100755
--- a/tests.branching/workflow-petrify.script
+++ b/tests.branching/workflow-petrify.script
@@ -31,44 +31,44 @@ fi
 . "$SRCDIR/scripts/setup-3rd-party-strata"
 
 cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" branch baserock:morphs test/petrify
+"$SRCDIR/scripts/test-morph" branch test:morphs test/petrify
 
 cd test/petrify
 "$SRCDIR/scripts/test-morph" petrify
 
 echo "test/petrify after petrifying:"
-cat baserock:morphs/hello-system.morph
-cat baserock:external-strata/stratum2.morph
-cat baserock:external-strata/stratum3.morph
+cat test:morphs/hello-system.morph
+cat test:external-strata/stratum2.morph
+cat test:external-strata/stratum3.morph
 
 "$SRCDIR/scripts/test-morph" edit hello-system stratum2 hello
 
 echo
 echo "test/petrify after editing a chunk:"
-cat baserock:morphs/hello-system.morph
-cat baserock:external-strata/stratum2.morph
-cat baserock:external-strata/stratum3.morph
+cat test:morphs/hello-system.morph
+cat test:external-strata/stratum2.morph
+cat test:external-strata/stratum3.morph
 
-# me/readme-fixes in baserock:stratum2-hello should be 'master', but
+# me/readme-fixes in test:stratum2-hello should be 'master', but
 # that's the only ref upstream so we can infer that it is if we got here
 
-cd baserock:morphs
+cd test:morphs
 git commit --quiet --all -m "Petrify branch test/petrify"
 git push --quiet origin test/petrify
-cd ../baserock:external-strata
+cd ../test:external-strata
 git commit --quiet --all -m "Petrify branch test/petrify"
 git push --quiet origin test/petrify
 
 # unpetrify is easy enough. Let's try unpetrifying a different branch that
 # was forked off the original while it was petrified, instead.
 cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" branch baserock:morphs test/unpetrify test/petrify
+"$SRCDIR/scripts/test-morph" branch test:morphs test/unpetrify test/petrify
 
 cd test/unpetrify
 "$SRCDIR/scripts/test-morph" unpetrify
 
 echo
 echo "test/unpetrify after unpetrifying:"
-cat baserock:morphs/hello-system.morph
-cat baserock:external-strata/stratum2.morph
-cat baserock:external-strata/stratum3.morph
+cat test:morphs/hello-system.morph
+cat test:external-strata/stratum2.morph
+cat test:external-strata/stratum3.morph
diff --git a/tests.branching/workflow-petrify.stdout b/tests.branching/workflow-petrify.stdout
index 2c50db9c..b572ed67 100644
--- a/tests.branching/workflow-petrify.stdout
+++ b/tests.branching/workflow-petrify.stdout
@@ -8,17 +8,17 @@ test/petrify after petrifying:
     "strata": [
         {
             "morph": "hello-stratum",
-            "repo": "baserock:morphs",
+            "repo": "test:morphs",
             "ref": "test/petrify"
         },
         {
             "morph": "stratum2",
-            "repo": "baserock:external-strata",
+            "repo": "test:external-strata",
             "ref": "test/petrify"
         },
         {
             "morph": "stratum3",
-            "repo": "baserock:external-strata",
+            "repo": "test:external-strata",
             "ref": "test/petrify"
         }
     ]
@@ -29,7 +29,7 @@ test/petrify after petrifying:
     "chunks": [
         {
             "name": "hello",
-            "repo": "baserock:stratum2-hello",
+            "repo": "test:stratum2-hello",
             "ref": "f4730636e429149bb923fa16be3aa9802d484b23",
             "build-depends": [],
             "unpetrify-ref": "master"
@@ -42,7 +42,7 @@ test/petrify after petrifying:
     "chunks": [
         {
             "name": "hello",
-            "repo": "baserock:stratum3-hello",
+            "repo": "test:stratum3-hello",
             "ref": "f4730636e429149bb923fa16be3aa9802d484b23",
             "build-depends": [],
             "unpetrify-ref": "master"
@@ -60,17 +60,17 @@ test/petrify after editing a chunk:
     "strata": [
         {
             "morph": "hello-stratum",
-            "repo": "baserock:morphs",
+            "repo": "test:morphs",
             "ref": "test/petrify"
         },
         {
             "morph": "stratum2",
-            "repo": "baserock:external-strata",
+            "repo": "test:external-strata",
             "ref": "test/petrify"
         },
         {
             "morph": "stratum3",
-            "repo": "baserock:external-strata",
+            "repo": "test:external-strata",
             "ref": "test/petrify"
         }
     ]
@@ -81,7 +81,7 @@ test/petrify after editing a chunk:
     "chunks": [
         {
             "name": "hello",
-            "repo": "baserock:stratum2-hello",
+            "repo": "test:stratum2-hello",
             "ref": "test/petrify",
             "build-depends": []
         }
@@ -93,7 +93,7 @@ test/petrify after editing a chunk:
     "chunks": [
         {
             "name": "hello",
-            "repo": "baserock:stratum3-hello",
+            "repo": "test:stratum3-hello",
             "ref": "f4730636e429149bb923fa16be3aa9802d484b23",
             "build-depends": [],
             "unpetrify-ref": "master"
@@ -111,17 +111,17 @@ test/unpetrify after unpetrifying:
     "strata": [
         {
             "morph": "hello-stratum",
-            "repo": "baserock:morphs",
+            "repo": "test:morphs",
             "ref": "test/unpetrify"
         },
         {
             "morph": "stratum2",
-            "repo": "baserock:external-strata",
+            "repo": "test:external-strata",
             "ref": "test/unpetrify"
         },
         {
             "morph": "stratum3",
-            "repo": "baserock:external-strata",
+            "repo": "test:external-strata",
             "ref": "test/unpetrify"
         }
     ]
@@ -132,7 +132,7 @@ test/unpetrify after unpetrifying:
     "chunks": [
         {
             "name": "hello",
-            "repo": "baserock:stratum2-hello",
+            "repo": "test:stratum2-hello",
             "ref": "test/petrify",
             "build-depends": []
         }
@@ -144,7 +144,7 @@ test/unpetrify after unpetrifying:
     "chunks": [
         {
             "name": "hello",
-            "repo": "baserock:stratum3-hello",
+            "repo": "test:stratum3-hello",
             "ref": "master",
             "build-depends": []
         }
diff --git a/tests.branching/workflow-separate-stratum-repos.script b/tests.branching/workflow-separate-stratum-repos.script
index 6f77672e..97ddb95d 100755
--- a/tests.branching/workflow-separate-stratum-repos.script
+++ b/tests.branching/workflow-separate-stratum-repos.script
@@ -27,28 +27,28 @@ set -eu
 # Make a change to the system
 # FIXME: we should try and build it, too
 cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" branch baserock:morphs me/readme-fixes
+"$SRCDIR/scripts/test-morph" branch test:morphs me/readme-fixes
 
 # Edit one chunk
 cd "me/readme-fixes"
 "$SRCDIR/scripts/test-morph" edit hello-system stratum2 hello
-cd "$DATADIR/workspace/me/readme-fixes/baserock:stratum2-hello"
+cd "$DATADIR/workspace/me/readme-fixes/test:stratum2-hello"
 echo > README yoyoyo
 git add README
 git commit -m "Fix README in hello" --quiet
 
 # Edit the other chunk too
 "$SRCDIR/scripts/test-morph" edit hello-system stratum3 hello
-cd "$DATADIR/workspace/me/readme-fixes/baserock:stratum3-hello"
+cd "$DATADIR/workspace/me/readme-fixes/test:stratum3-hello"
 echo > README yoyoyo
 git add README
 git commit -m "Fix README in hello" --quiet
 
 # Update the morphology repos
-cd ../baserock:external-strata
+cd ../test:external-strata
 git commit --quiet --all -m "Commit changes for system branch"
 
-cd ../baserock:morphs
+cd ../test:morphs
 git commit --quiet --all -m "Commit changes for system branch"
 
 # Merge our system branch into master
@@ -57,13 +57,13 @@ cd master
 "$SRCDIR/scripts/test-morph" merge me/readme-fixes
 
 # Check the changes have appeared
-cd baserock:morphs
+cd test:morphs
 [ $(git rev-parse HEAD) = $(git rev-parse master) ]
 
-cd ../baserock:stratum2-hello
+cd ../test:stratum2-hello
 [ -e README ]
 [ $(git rev-parse HEAD) = $(git rev-parse master) ]
 
-cd ../baserock:stratum3-hello
+cd ../test:stratum3-hello
 [ -e README ]
 [ $(git rev-parse HEAD) = $(git rev-parse master) ]
diff --git a/tests.branching/workflow.script b/tests.branching/workflow.script
index 68da4f4a..56415ce4 100755
--- a/tests.branching/workflow.script
+++ b/tests.branching/workflow.script
@@ -23,17 +23,17 @@ set -eu
 
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch baserock:morphs me/readme-fix
+"$SRCDIR/scripts/test-morph" branch test:morphs me/readme-fix
 "$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello
-cd me/readme-fix/baserock:hello
+cd me/readme-fix/test:hello
 echo > README yoyoyo
 git add README
 git commit -m "Fix README, yo!" --quiet
 
-cd ../baserock:morphs
+cd ../test:morphs
 git commit --quiet --all -m "Commit changes for system branch"
 
 cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" checkout baserock:morphs master
+"$SRCDIR/scripts/test-morph" checkout test:morphs master
 cd master
 "$SRCDIR/scripts/test-morph" merge me/readme-fix