diff --git a/docs/admin/creating-a-new-network.md b/docs/admin/creating-a-new-network.md
index 2d53233..ab3e6f5 100644
--- a/docs/admin/creating-a-new-network.md
+++ b/docs/admin/creating-a-new-network.md
@@ -86,7 +86,7 @@ be chosen with care.
 ## Step 3: Prepare to Encrypt `admin.yml`
 
 The `admin.yml` file (which will be created in the next step) is the most
-sensitive part of a isle network. If it falls into the wrong hands it can be
+sensitive part of an isle network. If it falls into the wrong hands it can be
 used to completely compromise your network, impersonate hosts on the network,
 and will likely lead to someone stealing or deleting all of your data.
 
diff --git a/docs/dev/design-principles.md b/docs/dev/design-principles.md
index 333cf0a..a7628a3 100644
--- a/docs/dev/design-principles.md
+++ b/docs/dev/design-principles.md
@@ -5,7 +5,7 @@ Isle project.
 
 * The UX is aggressively optimized to eliminate manual intervention by users.
   All other concerns are secondary. The concept of "UX" extends beyond GUI
-  interfaces, and encompasses all interactions of any sort with a isle
+  interfaces, and encompasses all interactions of any sort with an isle
   process.
 
 * All resources within an isle network are expected to be hosted on hardware
diff --git a/entrypoint/default.nix b/entrypoint/default.nix
index ba164b3..cdba966 100644
--- a/entrypoint/default.nix
+++ b/entrypoint/default.nix
@@ -4,7 +4,7 @@
 
 }: buildGoModule {
 
-  pname = "cryptic-net-entrypoint";
+  pname = "isle-entrypoint";
   version = "unstable";
   src = ./src;
   vendorSha256 = "sha256-P1TXG0fG8/6n37LmM5ApYctqoZzJFlvFAO2Zl85SVvk=";
diff --git a/entrypoint/src/cmd/entrypoint/daemon.go b/entrypoint/src/cmd/entrypoint/daemon.go
index 5935fe2..fdab2cb 100644
--- a/entrypoint/src/cmd/entrypoint/daemon.go
+++ b/entrypoint/src/cmd/entrypoint/daemon.go
@@ -280,6 +280,7 @@ var subCmdDaemon = subCmd{
 		case tryLoadBootstrap(bootstrapDataDirPath):
 		case *bootstrapPath != "" && tryLoadBootstrap(*bootstrapPath):
 		case tryLoadBootstrap(bootstrapAppDirPath):
+		case tryLoadBootstrap(bootstrap.DataDirPath(legacyEnvDataDirPath)):
 		case err != nil:
 			return fmt.Errorf("attempting to load bootstrap.yml file: %w", err)
 		default:
diff --git a/entrypoint/src/cmd/entrypoint/garage.go b/entrypoint/src/cmd/entrypoint/garage.go
index 80ba101..1b10c08 100644
--- a/entrypoint/src/cmd/entrypoint/garage.go
+++ b/entrypoint/src/cmd/entrypoint/garage.go
@@ -17,12 +17,12 @@ var subCmdGarageMC = subCmd{
 
 		keyID := flags.StringP(
 			"key-id", "i", "",
-			"Optional key ID to use, defaults to that of the shared cryptic-net-global key",
+			"Optional key ID to use, defaults to that of the shared global key",
 		)
 
 		keySecret := flags.StringP(
 			"key-secret", "s", "",
-			"Optional key secret to use, defaults to that of the shared cryptic-net-global key",
+			"Optional key secret to use, defaults to that of the shared global key",
 		)
 
 		if err := flags.Parse(subCmdCtx.args); err != nil {
diff --git a/entrypoint/src/cmd/entrypoint/main.go b/entrypoint/src/cmd/entrypoint/main.go
index 0f24179..3fe8eef 100644
--- a/entrypoint/src/cmd/entrypoint/main.go
+++ b/entrypoint/src/cmd/entrypoint/main.go
@@ -27,8 +27,12 @@ func getAppDirPath() string {
 
 var (
 	envAppDirPath     = getAppDirPath()
-	envRuntimeDirPath = filepath.Join(xdg.RuntimeDir, "cryptic-net")
-	envDataDirPath    = filepath.Join(xdg.DataHome, "cryptic-net")
+	envRuntimeDirPath = filepath.Join(xdg.RuntimeDir, "isle")
+	envDataDirPath    = filepath.Join(xdg.DataHome, "isle")
+
+	// Deprecated: envDataDirPath used to be this value, before renaming from
+	// cryptic-net
+	legacyEnvDataDirPath = filepath.Join(xdg.DataHome, "cryptic-net")
 )
 
 func binPath(name string) string {
diff --git a/entrypoint/src/garage/garage.go b/entrypoint/src/garage/garage.go
index e1883a7..39788ee 100644
--- a/entrypoint/src/garage/garage.go
+++ b/entrypoint/src/garage/garage.go
@@ -19,7 +19,7 @@ const (
 
 	// GlobalBucket is the name of the global garage bucket which is
 	// accessible to all hosts in the network.
-	GlobalBucket = "cryptic-net-global"
+	GlobalBucket = "_global"
 
 	// ReplicationFactor indicates the replication factor set on the garage
 	// cluster. We currently only support a factor of 3.
@@ -35,7 +35,7 @@ func nodeKeyPubPath(metaDirPath string) string {
 }
 
 func nodeRPCPortPath(metaDirPath string) string {
-	return filepath.Join(metaDirPath, "cryptic-net", "rpc_port")
+	return filepath.Join(metaDirPath, "isle", "rpc_port")
 }
 
 // loadAllocID returns the peer ID (ie the public key) of the node at the given