diff --git a/README.md b/README.md
index 1d56e7bb..6928af38 100644
--- a/README.md
+++ b/README.md
@@ -62,9 +62,9 @@ Download from [https://github.com/runatlantis/atlantis/releases](https://github.
 
 Run
 ```
-./atlantis bootstrap
+./atlantis testdrive
 ```
-This will walk you through running Atlantis locally. It will
+This mode sets up Atlantis on a test repo so you can try it out. It will
 - fork an example terraform project
 - install terraform (if not already in your PATH)
 - install ngrok so we can expose Atlantis to GitHub
diff --git a/cmd/bootstrap.go b/cmd/bootstrap.go
index 78df6c37..104200fe 100644
--- a/cmd/bootstrap.go
+++ b/cmd/bootstrap.go
@@ -17,20 +17,20 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/runatlantis/atlantis/bootstrap"
+	"github.com/runatlantis/atlantis/testdrive"
 	"github.com/spf13/cobra"
 )
 
-// BootstrapCmd starts the bootstrap process for testing out Atlantis.
-type BootstrapCmd struct{}
+// TestdriveCmd starts the testdrive process for testing out Atlantis.
+type TestdriveCmd struct{}
 
 // Init returns the runnable cobra command.
-func (b *BootstrapCmd) Init() *cobra.Command {
+func (b *TestdriveCmd) Init() *cobra.Command {
 	return &cobra.Command{
-		Use:   "bootstrap",
+		Use:   "testdrive",
 		Short: "Start a guided tour of Atlantis",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			err := bootstrap.Start()
+			err := testdrive.Start()
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "\033[31mError: %s\033[39m\n\n", err.Error())
 			}
diff --git a/main.go b/main.go
index 71bfd706..536d08d9 100644
--- a/main.go
+++ b/main.go
@@ -32,9 +32,9 @@ func main() {
 		AtlantisVersion: atlantisVersion,
 	}
 	version := &cmd.VersionCmd{AtlantisVersion: atlantisVersion}
-	bootstrap := &cmd.BootstrapCmd{}
+	testdrive := &cmd.TestdriveCmd{}
 	cmd.RootCmd.AddCommand(server.Init())
 	cmd.RootCmd.AddCommand(version.Init())
-	cmd.RootCmd.AddCommand(bootstrap.Init())
+	cmd.RootCmd.AddCommand(testdrive.Init())
 	cmd.Execute()
 }
diff --git a/scripts/coverage.sh b/scripts/coverage.sh
index 76065a1d..229df010 100755
--- a/scripts/coverage.sh
+++ b/scripts/coverage.sh
@@ -6,7 +6,7 @@
 # with multiple packages, see https://code.google.com/p/go/issues/detail?id=6909
 #
 # Usage: coverage.sh packages...
-# Example: coverage.sh github.com/runatlantis/atlantis github.com/runatlantis/atlantis/bootstrap
+# Example: coverage.sh github.com/runatlantis/atlantis github.com/runatlantis/atlantis/testdrive
 #
 
 set -e
diff --git a/bootstrap/github.go b/testdrive/github.go
similarity index 99%
rename from bootstrap/github.go
rename to testdrive/github.go
index 85614c3a..a12bfbf3 100644
--- a/bootstrap/github.go
+++ b/testdrive/github.go
@@ -11,7 +11,7 @@
 // limitations under the License.
 // Modified hereafter by contributors to runatlantis/atlantis.
 //
-package bootstrap
+package testdrive
 
 import (
 	"context"
diff --git a/bootstrap/bootstrap.go b/testdrive/testdrive.go
similarity index 96%
rename from bootstrap/bootstrap.go
rename to testdrive/testdrive.go
index 0ca228b8..368eb8db 100644
--- a/bootstrap/bootstrap.go
+++ b/testdrive/testdrive.go
@@ -11,9 +11,9 @@
 // limitations under the License.
 // Modified hereafter by contributors to runatlantis/atlantis.
 //
-// Package bootstrap is used by the bootstrap command as a quick-start of
+// Package testdrive is used by the testdrive command as a quick-start of
 // Atlantis.
-package bootstrap
+package testdrive
 
 import (
 	"context"
@@ -37,9 +37,9 @@ import (
 
 var terraformExampleRepoOwner = "runatlantis"
 var terraformExampleRepo = "atlantis-example"
-var bootstrapDescription = `[white]Welcome to Atlantis bootstrap!
+var bootstrapDescription = `[white]Welcome to Atlantis testdrive!
 
-This mode walks you through setting up and using Atlantis. We will
+This mode sets up Atlantis on a test repo so you can try it out. We will
 - fork an example terraform project to your username
 - install terraform (if not already in your PATH)
 - install ngrok so we can expose Atlantis to GitHub
@@ -53,12 +53,12 @@ var pullRequestBody = "In this pull request we will learn how to use atlantis. T
 	"* Now lets apply that plan. Type `atlantis apply` in the comments. This will run a `terraform apply`.\n" +
 	"\nThank you for trying out atlantis. For more info on running atlantis in production see https://github.com/runatlantis/atlantis"
 
-// Start begins the bootstrap process.
+// Start begins the testdrive process.
 // nolint: errcheck
 func Start() error {
 	s := spinner.New(spinner.CharSets[14], 100*time.Millisecond)
 	colorstring.Println(bootstrapDescription)
-	colorstring.Print("\n[white][bold]GitHub username: ")
+	colorstring.Print("\n[white][bold]github.com username: ")
 	fmt.Scanln(&githubUsername)
 	if githubUsername == "" {
 		return fmt.Errorf("please enter a valid github username")
@@ -231,7 +231,7 @@ tunnels:
 	colorstring.Println("[green] [press Ctrl-c to exit]")
 
 	// Wait for SIGINT or SIGTERM signals meaning the user has Ctrl-C'd the
-	// bootstrap process and want's to stop.
+	// testdrive process and want's to stop.
 	signalChan := make(chan os.Signal, 1)
 	signal.Notify(signalChan, syscall.SIGINT, syscall.SIGTERM)
 
diff --git a/bootstrap/utils.go b/testdrive/utils.go
similarity index 99%
rename from bootstrap/utils.go
rename to testdrive/utils.go
index ddb28b48..c4e6df54 100644
--- a/bootstrap/utils.go
+++ b/testdrive/utils.go
@@ -11,7 +11,7 @@
 // limitations under the License.
 // Modified hereafter by contributors to runatlantis/atlantis.
 //
-package bootstrap
+package testdrive
 
 import (
 	"archive/zip"