diff --git a/.envrc.dev b/.envrc.dev
index 20217895f..340b2e807 100644
--- a/.envrc.dev
+++ b/.envrc.dev
@@ -1,3 +1,3 @@
 export KUBECONFIG=$(pwd)/tools/devmode-kubeconfig
-export OTTO_DEV_MODE=true
+export OTTO8_DEV_MODE=true
 export WORKSPACE_PROVIDER_IGNORE_WORKSPACE_NOT_FOUND=true
diff --git a/Dockerfile b/Dockerfile
index cb383e5f5..756ff6cfa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,7 +34,7 @@ mkdir -p /run/sshd
 /usr/sbin/sshd -D &
 mkdir -p /data/cache
 # This is YAML
-export OTTO_SERVER_VERSIONS="$(cat <<VERSIONS
+export OTTO8_SERVER_VERSIONS="$(cat <<VERSIONS
 "github.com/otto8-ai/tools": "$(cd /otto8-tools && git rev-parse HEAD)"
 "github.com/gptscript-ai/workspace-provider": "$(cd /otto8-tools/workspace-provider && git rev-parse HEAD)"
 "github.com/gptscript-ai/datasets": "$(cd /otto8-tools/datasets && git rev-parse HEAD)"
@@ -52,10 +52,10 @@ ENV PATH=$PATH:/usr/lib/libreoffice/program
 ENV HOME=/data
 ENV XDG_CACHE_HOME=/data/cache
 ENV GPTSCRIPT_SYSTEM_TOOLS_DIR=/otto8-tools/
-ENV OTTO_SERVER_WORKSPACE_TOOL=/otto8-tools/workspace-provider
-ENV OTTO_SERVER_DATASETS_TOOL=/otto8-tools/datasets
-ENV OTTO_SERVER_TOOL_REGISTRY=/otto8-tools
-ENV OTTO_SERVER_ENCRYPTION_CONFIG_FILE=/encryption.yaml
+ENV OTTO8_SERVER_WORKSPACE_TOOL=/otto8-tools/workspace-provider
+ENV OTTO8_SERVER_DATASETS_TOOL=/otto8-tools/datasets
+ENV OTTO8_SERVER_TOOL_REGISTRY=/otto8-tools
+ENV OTTO8_SERVER_ENCRYPTION_CONFIG_FILE=/encryption.yaml
 ENV GOMEMLIMIT=1GiB
 ENV TERM=vt100
 WORKDIR /data
diff --git a/docs/docs/04-configuration/02-model-providers.md b/docs/docs/04-configuration/02-model-providers.md
index 992dc1553..4abdb1def 100644
--- a/docs/docs/04-configuration/02-model-providers.md
+++ b/docs/docs/04-configuration/02-model-providers.md
@@ -1,6 +1,6 @@
 # Model Providers
 
-Each packaged model provider has a slightly different, but all require at least, the `OTTO_*_MODEL_PROVIDER_API_KEY` environment variable are required, where `*` stands in for the name of the provider (e.g. `OTTO_AZURE_OPENAI_MODEL_PROVIDER_API_KEY`).
+Each packaged model provider has a slightly different, but all require at least, the `OTTO8_*_MODEL_PROVIDER_API_KEY` environment variable are required, where `*` stands in for the name of the provider (e.g. `OTTO8_AZURE_OPENAI_MODEL_PROVIDER_API_KEY`).
 
 Below is a summary of the configuration options for each provider. However, the packaged model providers are configured to indicate which environment variables are required and which ones are not set in the current environment. For example, `/api/tool-references/azure-openai-model-provider` would indicate the status of the Azure OpenAI model provider. If the environment variables are not set, then the API would return something like:
 
@@ -9,7 +9,7 @@ Below is a summary of the configuration options for each provider. However, the
   "id": "azure-openai-model-provider",
   "created": "2024-11-08T16:03:21-05:00",
   "metadata": {
-    "envVars": "OTTO_AZURE_OPENAI_MODEL_PROVIDER_API_KEY,OTTO_AZURE_OPENAI_MODEL_PROVIDER_ENDPOINT,OTTO_AZURE_OPENAI_MODEL_PROVIDER_DEPLOYMENT_NAME"
+    "envVars": "OTTO8_AZURE_OPENAI_MODEL_PROVIDER_API_KEY,OTTO8_AZURE_OPENAI_MODEL_PROVIDER_ENDPOINT,OTTO8_AZURE_OPENAI_MODEL_PROVIDER_DEPLOYMENT_NAME"
   },
   "name": "Azure OpenAI Provider",
   "toolType": "modelProvider",
@@ -19,9 +19,9 @@ Below is a summary of the configuration options for each provider. However, the
   "description": "Model provider for Azure OpenAI hosted models",
   "modelProviderStatus": {
     "missingEnvVars": [
-      "OTTO_AZURE_OPENAI_MODEL_PROVIDER_API_KEY",
-      "OTTO_AZURE_OPENAI_MODEL_PROVIDER_ENDPOINT",
-      "OTTO_AZURE_OPENAI_MODEL_PROVIDER_DEPLOYMENT_NAME"
+      "OTTO8_AZURE_OPENAI_MODEL_PROVIDER_API_KEY",
+      "OTTO8_AZURE_OPENAI_MODEL_PROVIDER_ENDPOINT",
+      "OTTO8_AZURE_OPENAI_MODEL_PROVIDER_DEPLOYMENT_NAME"
     ],  
     "configured": false
   }
@@ -36,7 +36,7 @@ Once all the required environment variables are set, then the API would return s
   "id": "azure-openai-model-provider",
   "created": "2024-11-08T16:03:21-05:00",
   "metadata": {
-    "envVars": "OTTO_AZURE_OPENAI_MODEL_PROVIDER_API_KEY,OTTO_AZURE_OPENAI_MODEL_PROVIDER_ENDPOINT,OTTO_AZURE_OPENAI_MODEL_PROVIDER_DEPLOYMENT_NAME"
+    "envVars": "OTTO8_AZURE_OPENAI_MODEL_PROVIDER_API_KEY,OTTO8_AZURE_OPENAI_MODEL_PROVIDER_ENDPOINT,OTTO8_AZURE_OPENAI_MODEL_PROVIDER_DEPLOYMENT_NAME"
   },
   "name": "Azure OpenAI Provider",
   "toolType": "modelProvider",
@@ -54,15 +54,15 @@ The UI also uses this API to indicate the status of the model provider.
 
 ## OpenAI
 
-The OpenAI model provider is the default and is configured by either setting `OPENAI_API_KEY` or `OTTO_OPENAI_MODEL_PROVIDER_API_KEY` environment variables.
+The OpenAI model provider is the default and is configured by either setting `OPENAI_API_KEY` or `OTTO8_OPENAI_MODEL_PROVIDER_API_KEY` environment variables.
 
 ## Azure OpenAI
 
 The Azure OpenAI model provider is configured by setting the following environment variables:
-- `OTTO_AZURE_OPENAI_MODEL_PROVIDER_API_KEY`: Found on the "Home" page of the Azure OpenAI Studio.
-- `OTTO_AZURE_OPENAI_MODEL_PROVIDER_DEPLOYMENT_NAME`: The name of the deployment to use, found on the "Deployments" page of the Azure OpenAI Studio.
-- `OTTO_AZURE_OPENAI_MODEL_PROVIDER_ENDPOINT`:  The endpoint to use, found by clicking on the "Deployment" name from the "Deployments" page of the Azure OpenAI Studio.
+- `OTTO8_AZURE_OPENAI_MODEL_PROVIDER_API_KEY`: Found on the "Home" page of the Azure OpenAI Studio.
+- `OTTO8_AZURE_OPENAI_MODEL_PROVIDER_DEPLOYMENT_NAME`: The name of the deployment to use, found on the "Deployments" page of the Azure OpenAI Studio.
+- `OTTO8_AZURE_OPENAI_MODEL_PROVIDER_ENDPOINT`:  The endpoint to use, found by clicking on the "Deployment" name from the "Deployments" page of the Azure OpenAI Studio.
 
 ## Anthropic
 
-The Anthropic model provider is configured by setting the `OTTO_ANTHROPIC_MODEL_PROVIDER_API_KEY` environment variable. An API key for your Anthropic account can be obtained [here](https://console.anthropic.com/settings/keys).
+The Anthropic model provider is configured by setting the `OTTO8_ANTHROPIC_MODEL_PROVIDER_API_KEY` environment variable. An API key for your Anthropic account can be obtained [here](https://console.anthropic.com/settings/keys).
diff --git a/docs/docs/04-configuration/03-auth-providers.md b/docs/docs/04-configuration/03-auth-providers.md
index b8e3f2f6c..40dca3572 100644
--- a/docs/docs/04-configuration/03-auth-providers.md
+++ b/docs/docs/04-configuration/03-auth-providers.md
@@ -6,14 +6,14 @@ Authentication providers allow your Otto installation to authenticate users with
 
 The following environment variables are required for all authentication providers. Setting the Client ID and Client Secret will mean that the authentication provider is enabled. The remaining configuration will be validated on startup.
 
-- `OTTO_AUTH_CLIENT_ID`: The client ID of the authentication provider.
-- `OTTO_AUTH_CLIENT_SECRET`: The client secret of the authentication provider.
-- `OTTO_AUTH_COOKIE_SECRET`: The secret used to encrypt the authentication cookie. Must be of size 16, 24, or 32 bytes.
-- `OTTO_AUTH_ADMIN_EMAILS`: A comma-separated list of the email addresses of the admin users.
+- `OTTO8_AUTH_CLIENT_ID`: The client ID of the authentication provider.
+- `OTTO8_AUTH_CLIENT_SECRET`: The client secret of the authentication provider.
+- `OTTO8_AUTH_COOKIE_SECRET`: The secret used to encrypt the authentication cookie. Must be of size 16, 24, or 32 bytes.
+- `OTTO8_AUTH_ADMIN_EMAILS`: A comma-separated list of the email addresses of the admin users.
 
 The following environment variables are optional for all authentication providers:
-- `OTTO_AUTH_EMAIL_DOMAINS`: A comma-separated list of email domains allowed for authentication. Ignored if not set.
-- `OTTO_AUTH_CONFIG_TYPE`: The type of the authentication provider. For example, `google` or `github`. Defaults to `google`.
+- `OTTO8_AUTH_EMAIL_DOMAINS`: A comma-separated list of email domains allowed for authentication. Ignored if not set.
+- `OTTO8_AUTH_CONFIG_TYPE`: The type of the authentication provider. For example, `google` or `github`. Defaults to `google`.
 
 ## Google
 
@@ -23,8 +23,8 @@ Google is the default authentication provider. There are currently no additional
 
 GitHub authentication has the following optional configuration:
 
-- `OTTO_AUTH_GITHUB_ORG`: The name of the organization allowed for authentication. Ignored if not set.
-- `OTTO_AUTH_GITHUB_TEAM`: The name of the team allowed for authentication. Ignored if not set.
-- `OTTO_AUTH_GITHUB_REPOS`: A comma-separated list of the names of the repositories allowed for authentication, in the format `org/repo`. Ignored if not set.
-- `OTTO_AUTH_GITHUB_TOKEN`: The token to use when verifying repository collaborators (must have push access to the repository).
-- `OTTO_AUTH_GITHUB_ALLOW_USERS`: A comma-separated list of users allowed to login even if they don't belong to the organization or team.
\ No newline at end of file
+- `OTTO8_AUTH_GITHUB_ORG`: The name of the organization allowed for authentication. Ignored if not set.
+- `OTTO8_AUTH_GITHUB_TEAM`: The name of the team allowed for authentication. Ignored if not set.
+- `OTTO8_AUTH_GITHUB_REPOS`: A comma-separated list of the names of the repositories allowed for authentication, in the format `org/repo`. Ignored if not set.
+- `OTTO8_AUTH_GITHUB_TOKEN`: The token to use when verifying repository collaborators (must have push access to the repository).
+- `OTTO8_AUTH_GITHUB_ALLOW_USERS`: A comma-separated list of users allowed to login even if they don't belong to the organization or team.
\ No newline at end of file
diff --git a/pkg/api/handlers/version.go b/pkg/api/handlers/version.go
index 0fa44a239..e6a390230 100644
--- a/pkg/api/handlers/version.go
+++ b/pkg/api/handlers/version.go
@@ -14,7 +14,7 @@ func GetVersion(req api.Context) error {
 
 func getVersionResponse() map[string]string {
 	values := make(map[string]string)
-	versions := os.Getenv("OTTO_SERVER_VERSIONS")
+	versions := os.Getenv("OTTO8_SERVER_VERSIONS")
 	if versions != "" {
 		if err := yaml.Unmarshal([]byte(versions), &values); err != nil {
 			values["error"] = err.Error()
diff --git a/pkg/cli/agents.go b/pkg/cli/agents.go
index ebf51c81c..f174b9c08 100644
--- a/pkg/cli/agents.go
+++ b/pkg/cli/agents.go
@@ -9,7 +9,7 @@ import (
 )
 
 type Agents struct {
-	root  *Otto
+	root  *Otto8
 	Quiet bool `usage:"Only print IDs of agents" short:"q"`
 	Wide  bool `usage:"Print more information" short:"w"`
 }
diff --git a/pkg/cli/create.go b/pkg/cli/create.go
index f14428e44..5fbd9aef5 100644
--- a/pkg/cli/create.go
+++ b/pkg/cli/create.go
@@ -18,7 +18,7 @@ import (
 
 type Create struct {
 	Quiet bool `usage:"Only print ID after successful creation." short:"q"`
-	root  *Otto
+	root  *Otto8
 }
 
 func (l *Create) Customize(cmd *cobra.Command) {
diff --git a/pkg/cli/credentials.go b/pkg/cli/credentials.go
index c173e6fdd..2f91937cc 100644
--- a/pkg/cli/credentials.go
+++ b/pkg/cli/credentials.go
@@ -11,7 +11,7 @@ import (
 )
 
 type Credentials struct {
-	root     *Otto
+	root     *Otto8
 	Wide     bool   `usage:"Print more information" short:"w"`
 	Quiet    bool   `usage:"Only print IDs of credentials" short:"q"`
 	ThreadID string `usage:"Specific thread list credentials for" short:"t"`
diff --git a/pkg/cli/credentials_delete.go b/pkg/cli/credentials_delete.go
index b77788282..933ee5903 100644
--- a/pkg/cli/credentials_delete.go
+++ b/pkg/cli/credentials_delete.go
@@ -10,7 +10,7 @@ import (
 )
 
 type CredentialsDelete struct {
-	root  *Otto
+	root  *Otto8
 	Quiet bool `usage:"Only print IDs of credentials" short:"q"`
 }
 
diff --git a/pkg/cli/edit.go b/pkg/cli/edit.go
index 9faa5a497..b08c37b49 100644
--- a/pkg/cli/edit.go
+++ b/pkg/cli/edit.go
@@ -12,7 +12,7 @@ import (
 )
 
 type Edit struct {
-	root   *Otto
+	root   *Otto8
 	Prompt bool `usage:"Edit just the prompt for the agent" short:"p"`
 }
 
diff --git a/pkg/cli/edit/edit.go b/pkg/cli/edit/edit.go
index 35fb64bd5..958df04b1 100644
--- a/pkg/cli/edit/edit.go
+++ b/pkg/cli/edit/edit.go
@@ -12,7 +12,7 @@ import (
 
 var (
 	envs = []string{
-		"OTTO_EDITOR",
+		"OTTO8_EDITOR",
 		"EDITOR",
 	}
 )
diff --git a/pkg/cli/internal/token.go b/pkg/cli/internal/token.go
index 04321e559..14e0e8ea9 100644
--- a/pkg/cli/internal/token.go
+++ b/pkg/cli/internal/token.go
@@ -84,7 +84,7 @@ func Token(ctx context.Context, baseURL, appName string) (string, error) {
 		fmt.Println(color.GreenString("========================"))
 		fmt.Println()
 		fmt.Println(color.CyanString(serviceName) + " is used for authentication using the browser. This can be bypassed by setting")
-		fmt.Println("the env var " + color.CyanString("OTTO_API_KEY") + " to your API key.")
+		fmt.Println("the env var " + color.CyanString("OTTO8_API_KEY") + " to your API key.")
 		fmt.Println()
 		fmt.Println(color.GreenString("Press ENTER to continue (CTRL+C to exit)"))
 		if err := enter(ctx); err != nil {
diff --git a/pkg/cli/invoke.go b/pkg/cli/invoke.go
index 4f0164a1c..189ffdd29 100644
--- a/pkg/cli/invoke.go
+++ b/pkg/cli/invoke.go
@@ -17,7 +17,7 @@ type Invoke struct {
 	Quiet   *bool  `usage:"Only print output characters" short:"q"`
 	Verbose bool   `usage:"Print more information" short:"v"`
 	Async   bool   `usage:"Run the agent asynchronously" short:"a"`
-	root    *Otto
+	root    *Otto8
 }
 
 func (l *Invoke) GetQuiet() bool {
diff --git a/pkg/cli/rm.go b/pkg/cli/rm.go
index 1ba123dd8..f89a519ee 100644
--- a/pkg/cli/rm.go
+++ b/pkg/cli/rm.go
@@ -9,7 +9,7 @@ import (
 )
 
 type Delete struct {
-	root *Otto
+	root *Otto8
 }
 
 func (l *Delete) Customize(cmd *cobra.Command) {
diff --git a/pkg/cli/root.go b/pkg/cli/root.go
index 318b25297..191eef74b 100644
--- a/pkg/cli/root.go
+++ b/pkg/cli/root.go
@@ -13,12 +13,12 @@ import (
 	"golang.org/x/term"
 )
 
-type Otto struct {
+type Otto8 struct {
 	Debug  bool `usage:"Enable debug logging"`
 	Client *apiclient.Client
 }
 
-func (a *Otto) PersistentPre(cmd *cobra.Command, args []string) error {
+func (a *Otto8) PersistentPre(cmd *cobra.Command, args []string) error {
 	if os.Getenv("NO_COLOR") != "" || !term.IsTerminal(int(os.Stdout.Fd())) {
 		color.NoColor = true
 	}
@@ -27,7 +27,7 @@ func (a *Otto) PersistentPre(cmd *cobra.Command, args []string) error {
 		logger.SetDebug()
 	}
 
-	if a.Client.Token == "" && cmd.Use != "server" && cmd.Use != "otto" {
+	if a.Client.Token == "" && cmd.Use != "server" && cmd.Use != "otto8" && cmd.Use != "version" {
 		token, err := internal.Token(cmd.Context(), a.Client.BaseURL, "otto8")
 		if err != nil {
 			return err
@@ -40,10 +40,10 @@ func (a *Otto) PersistentPre(cmd *cobra.Command, args []string) error {
 }
 
 func New() *cobra.Command {
-	root := &Otto{
+	root := &Otto8{
 		Client: &apiclient.Client{
-			BaseURL: env.VarOrDefault("OTTO_BASE_URL", "http://localhost:8080/api"),
-			Token:   os.Getenv("OTTO_TOKEN"),
+			BaseURL: env.VarOrDefault("OTTO8_BASE_URL", "http://localhost:8080/api"),
+			Token:   os.Getenv("OTTO8_TOKEN"),
 		},
 	}
 	return cmd.Command(root,
@@ -67,6 +67,6 @@ func New() *cobra.Command {
 	)
 }
 
-func (a *Otto) Run(cmd *cobra.Command, args []string) error {
+func (a *Otto8) Run(cmd *cobra.Command, args []string) error {
 	return cmd.Help()
 }
diff --git a/pkg/cli/run_debug.go b/pkg/cli/run_debug.go
index 8d92fc823..0148f3567 100644
--- a/pkg/cli/run_debug.go
+++ b/pkg/cli/run_debug.go
@@ -8,7 +8,7 @@ import (
 )
 
 type Debug struct {
-	root *Otto
+	root *Otto8
 }
 
 func (l *Debug) Customize(cmd *cobra.Command) {
diff --git a/pkg/cli/run_print.go b/pkg/cli/run_print.go
index f4335eaa4..1c88e628d 100644
--- a/pkg/cli/run_print.go
+++ b/pkg/cli/run_print.go
@@ -6,7 +6,7 @@ import (
 )
 
 type RunPrint struct {
-	root    *Otto
+	root    *Otto8
 	Quiet   bool `usage:"Only print the response content of the runs" short:"q"`
 	Verbose bool `usage:"Print more information" short:"v"`
 }
diff --git a/pkg/cli/runs.go b/pkg/cli/runs.go
index f6454ed3c..8692ba9b5 100644
--- a/pkg/cli/runs.go
+++ b/pkg/cli/runs.go
@@ -13,7 +13,7 @@ import (
 )
 
 type Runs struct {
-	root   *Otto
+	root   *Otto8
 	Wide   bool `usage:"Print more information" short:"w"`
 	Quiet  bool `usage:"Only print IDs of runs" short:"q"`
 	Follow bool `usage:"Follow the output of runs" short:"f"`
diff --git a/pkg/cli/steptemplates_update.go b/pkg/cli/steptemplates_update.go
index 454a47e1c..9438fcba2 100644
--- a/pkg/cli/steptemplates_update.go
+++ b/pkg/cli/steptemplates_update.go
@@ -7,7 +7,7 @@ import (
 )
 
 type StepTemplateUpdate struct {
-	root  *Otto
+	root  *Otto8
 	Quiet bool `usage:"Only print IDs of updated step template" short:"q"`
 }
 
diff --git a/pkg/cli/threadprint.go b/pkg/cli/threadprint.go
index e64ced4d2..061e77eee 100644
--- a/pkg/cli/threadprint.go
+++ b/pkg/cli/threadprint.go
@@ -7,7 +7,7 @@ import (
 )
 
 type ThreadPrint struct {
-	root    *Otto
+	root    *Otto8
 	Quiet   bool `usage:"Only print response content of threads" short:"q"`
 	Follow  bool `usage:"Follow the thread and print new events" short:"f"`
 	Verbose bool `usage:"Print more information" short:"v"`
diff --git a/pkg/cli/threads.go b/pkg/cli/threads.go
index 08fa3353f..27d4640d6 100644
--- a/pkg/cli/threads.go
+++ b/pkg/cli/threads.go
@@ -9,7 +9,7 @@ import (
 )
 
 type Threads struct {
-	root  *Otto
+	root  *Otto8
 	Quiet bool `usage:"Only print IDs of threads" short:"q"`
 	Wide  bool `usage:"Print more information" short:"w"`
 }
diff --git a/pkg/cli/tools.go b/pkg/cli/tools.go
index 06fab2db5..4dfc1439d 100644
--- a/pkg/cli/tools.go
+++ b/pkg/cli/tools.go
@@ -8,7 +8,7 @@ import (
 )
 
 type Tools struct {
-	root  *Otto
+	root  *Otto8
 	Quiet bool `usage:"Only print IDs of tools" short:"q"`
 }
 
diff --git a/pkg/cli/tools_register.go b/pkg/cli/tools_register.go
index 28f0e6089..e0dce98a6 100644
--- a/pkg/cli/tools_register.go
+++ b/pkg/cli/tools_register.go
@@ -8,7 +8,7 @@ import (
 )
 
 type ToolRegister struct {
-	root  *Otto
+	root  *Otto8
 	Quiet bool `usage:"Only print IDs of created tool references:"q"`
 }
 
diff --git a/pkg/cli/tools_unregister.go b/pkg/cli/tools_unregister.go
index 8998d02a2..464b76854 100644
--- a/pkg/cli/tools_unregister.go
+++ b/pkg/cli/tools_unregister.go
@@ -8,7 +8,7 @@ import (
 )
 
 type ToolUnregister struct {
-	root  *Otto
+	root  *Otto8
 	Quiet bool `usage:"Only print IDs of unregistered tool references" short:"q"`
 }
 
diff --git a/pkg/cli/update.go b/pkg/cli/update.go
index 7bf3da6f3..bb7854804 100644
--- a/pkg/cli/update.go
+++ b/pkg/cli/update.go
@@ -11,7 +11,7 @@ import (
 )
 
 type Update struct {
-	root  *Otto
+	root  *Otto8
 	Quiet bool `usage:"Only print IDs of updated agent/workflow" short:"q"`
 }
 
diff --git a/pkg/cli/version.go b/pkg/cli/version.go
index a6a6a7415..fe60683d9 100644
--- a/pkg/cli/version.go
+++ b/pkg/cli/version.go
@@ -8,7 +8,7 @@ import (
 )
 
 type Version struct {
-	root *Otto
+	root *Otto8
 }
 
 func (l *Version) Run(cmd *cobra.Command, args []string) error {
diff --git a/pkg/cli/workflow_auth.go b/pkg/cli/workflow_auth.go
index d7361edbf..966998c8f 100644
--- a/pkg/cli/workflow_auth.go
+++ b/pkg/cli/workflow_auth.go
@@ -6,7 +6,7 @@ import (
 )
 
 type WorkflowAuth struct {
-	root *Otto
+	root *Otto8
 }
 
 func (l *WorkflowAuth) Customize(cmd *cobra.Command) {
diff --git a/pkg/cli/workflows.go b/pkg/cli/workflows.go
index ab18f5704..89978a98f 100644
--- a/pkg/cli/workflows.go
+++ b/pkg/cli/workflows.go
@@ -9,7 +9,7 @@ import (
 )
 
 type Workflows struct {
-	root  *Otto
+	root  *Otto8
 	Quiet bool `usage:"Only print IDs of agents" short:"q"`
 	Wide  bool `usage:"Print more information" short:"w"`
 }
diff --git a/pkg/events/events.go b/pkg/events/events.go
index 95052bb61..668526704 100644
--- a/pkg/events/events.go
+++ b/pkg/events/events.go
@@ -702,7 +702,7 @@ func (e *Emitter) printCall(ctx context.Context, namespace, runID string, prg *g
 
 func isSubCallTargetIDs(tool gptscript.Tool) (agentID string, workflowID string) {
 	for _, line := range strings.Split(tool.Instructions, "\n") {
-		suffix, ok := strings.CutPrefix(line, "#OTTO_SUBCALL: TARGET: ")
+		suffix, ok := strings.CutPrefix(line, "#OTTO8_SUBCALL: TARGET: ")
 		if !ok {
 			continue
 		}
diff --git a/pkg/gateway/server/dispatcher/dispatcher.go b/pkg/gateway/server/dispatcher/dispatcher.go
index 14e81b554..f8bd5e4d1 100644
--- a/pkg/gateway/server/dispatcher/dispatcher.go
+++ b/pkg/gateway/server/dispatcher/dispatcher.go
@@ -31,7 +31,7 @@ type Dispatcher struct {
 
 func New(invoker *invoke.Invoker, c kclient.Client) *Dispatcher {
 	return &Dispatcher{
-		openAIAPIKey: os.Getenv("OTTO_OPENAI_MODEL_PROVIDER_API_KEY"),
+		openAIAPIKey: os.Getenv("OTTO8_OPENAI_MODEL_PROVIDER_API_KEY"),
 		invoker:      invoker,
 		client:       c,
 		lock:         new(sync.RWMutex),
diff --git a/pkg/gateway/server/server.go b/pkg/gateway/server/server.go
index 42803c768..2f84d352e 100644
--- a/pkg/gateway/server/server.go
+++ b/pkg/gateway/server/server.go
@@ -20,7 +20,7 @@ import (
 
 type Options struct {
 	Hostname     string
-	UIHostname   string `name:"ui-hostname" env:"OTTO_SERVER_UI_HOSTNAME"`
+	UIHostname   string `name:"ui-hostname" env:"OTTO8_SERVER_UI_HOSTNAME"`
 	GatewayDebug bool
 }
 
diff --git a/pkg/invoke/invoker.go b/pkg/invoke/invoker.go
index 5b26c4b4e..80ab5353b 100644
--- a/pkg/invoke/invoker.go
+++ b/pkg/invoke/invoker.go
@@ -495,14 +495,14 @@ func (i *Invoker) Resume(ctx context.Context, c kclient.WithWatch, thread *v1.Th
 				fmt.Sprintf("GPTSCRIPT_MODEL_PROVIDER_PROXY_URL=%s/api/llm-proxy", i.serverURL),
 				"GPTSCRIPT_MODEL_PROVIDER_PROXY_TOKEN="+token,
 				"GPTSCRIPT_MODEL_PROVIDER_TOKEN="+token,
-				"OTTO_SERVER_URL="+i.serverURL,
-				"OTTO_TOKEN="+token,
-				"OTTO_RUN_ID="+run.Name,
-				"OTTO_THREAD_ID="+thread.Name,
-				"OTTO_WORKFLOW_ID="+run.Spec.WorkflowName,
-				"OTTO_WORKFLOW_STEP_ID="+run.Spec.WorkflowStepID,
-				"OTTO_AGENT_ID="+run.Spec.AgentName,
-				"GPTSCRIPT_HTTP_ENV=OTTO_TOKEN,OTTO_RUN_ID,OTTO_THREAD_ID,OTTO_WORKFLOW_ID,OTTO_WORKFLOW_STEP_ID,OTTO_AGENT_ID",
+				"OTTO8_SERVER_URL="+i.serverURL,
+				"OTTO8_TOKEN="+token,
+				"OTTO8_RUN_ID="+run.Name,
+				"OTTO8_THREAD_ID="+thread.Name,
+				"OTTO8_WORKFLOW_ID="+run.Spec.WorkflowName,
+				"OTTO8_WORKFLOW_STEP_ID="+run.Spec.WorkflowStepID,
+				"OTTO8_AGENT_ID="+run.Spec.AgentName,
+				"GPTSCRIPT_HTTP_ENV=OTTO8_TOKEN,OTTO8_RUN_ID,OTTO8_THREAD_ID,OTTO8_WORKFLOW_ID,OTTO8_WORKFLOW_STEP_ID,OTTO8_AGENT_ID",
 			),
 			DefaultModel:         run.Spec.DefaultModel,
 			DefaultModelProvider: modelProvider,
diff --git a/pkg/render/render.go b/pkg/render/render.go
index 82d29b40f..e804efb0c 100644
--- a/pkg/render/render.go
+++ b/pkg/render/render.go
@@ -280,7 +280,7 @@ func manifestToTool(manifest types.AgentManifest, agentType, ref, id string) gpt
 		}
 	}
 	toolDef.Instructions = fmt.Sprintf(`#!/bin/bash
-#OTTO_SUBCALL: TARGET: %s
+#OTTO8_SUBCALL: TARGET: %s
 INPUT=$(${GPTSCRIPT_BIN} getenv GPTSCRIPT_INPUT)
 if echo "${INPUT}" | grep -q '^{'; then
 	echo '{"%s":"%s","type":"OttoSubFlow",'
diff --git a/pkg/services/config.go b/pkg/services/config.go
index 43f7e80c8..02f3f419a 100644
--- a/pkg/services/config.go
+++ b/pkg/services/config.go
@@ -49,15 +49,15 @@ type (
 
 type Config struct {
 	HTTPListenPort        int    `usage:"HTTP port to listen on" default:"8080" name:"http-listen-port"`
-	DevMode               bool   `usage:"Enable development mode" default:"false" name:"dev-mode" env:"OTTO_DEV_MODE"`
+	DevMode               bool   `usage:"Enable development mode" default:"false" name:"dev-mode" env:"OTTO8_DEV_MODE"`
 	DevUIPort             int    `usage:"The port on localhost running the dev instance of the UI" default:"5173"`
 	AllowedOrigin         string `usage:"Allowed origin for CORS"`
 	ToolRegistry          string `usage:"The tool reference for the tool registry" default:"github.com/otto8-ai/tools"`
-	WorkspaceProviderType string `usage:"The type of workspace provider to use for non-knowledge workspaces" default:"directory" env:"OTTO_WORKSPACE_PROVIDER_TYPE"`
+	WorkspaceProviderType string `usage:"The type of workspace provider to use for non-knowledge workspaces" default:"directory" env:"OTTO8_WORKSPACE_PROVIDER_TYPE"`
 	WorkspaceTool         string `usage:"The tool reference for the workspace provider" default:"github.com/gptscript-ai/workspace-provider"`
 	DatasetsTool          string `usage:"The tool reference for the dataset provider" default:"github.com/gptscript-ai/datasets"`
 	HelperModel           string `usage:"The model used to generate names and descriptions" default:"gpt-4o-mini"`
-	AWSKMSKeyARN          string `usage:"The ARN of the AWS KMS key to use for encrypting credential storage" env:"OTTO_AWS_KMS_KEY_ARN" name:"aws-kms-key-arn"`
+	AWSKMSKeyARN          string `usage:"The ARN of the AWS KMS key to use for encrypting credential storage" env:"OTTO8_AWS_KMS_KEY_ARN" name:"aws-kms-key-arn"`
 	EncryptionConfigFile  string `usage:"The path to the encryption configuration file" default:"./encryption.yaml"`
 
 	AuthConfig
@@ -146,8 +146,8 @@ func New(ctx context.Context, config Config) (*Services, error) {
 	}
 
 	// Set the OpenAI model provider API key, just for consistency
-	if os.Getenv("OTTO_OPENAI_MODEL_PROVIDER_API_KEY") == "" {
-		_ = os.Setenv("OTTO_OPENAI_MODEL_PROVIDER_API_KEY", os.Getenv("OPENAI_API_KEY"))
+	if os.Getenv("OTTO8_OPENAI_MODEL_PROVIDER_API_KEY") == "" {
+		_ = os.Setenv("OTTO8_OPENAI_MODEL_PROVIDER_API_KEY", os.Getenv("OPENAI_API_KEY"))
 	}
 
 	if err := credstores.Init(ctx, config.ToolRegistry, config.DSN, credstores.Options{
diff --git a/pkg/storage/apis/otto.otto8.ai/v1/scheme.go b/pkg/storage/apis/otto.otto8.ai/v1/scheme.go
index 1eacd4dba..663a45e7b 100644
--- a/pkg/storage/apis/otto.otto8.ai/v1/scheme.go
+++ b/pkg/storage/apis/otto.otto8.ai/v1/scheme.go
@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/otto8-ai/nah/pkg/fields"
-	otto_gptscript_ai "github.com/otto8-ai/otto8/pkg/storage/apis/otto.otto8.ai"
+	OTTO8_gptscript_ai "github.com/otto8-ai/otto8/pkg/storage/apis/otto.otto8.ai"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -11,7 +11,7 @@ import (
 const Version = "v1"
 
 var SchemeGroupVersion = schema.GroupVersion{
-	Group:   otto_gptscript_ai.Group,
+	Group:   OTTO8_gptscript_ai.Group,
 	Version: Version,
 }
 
diff --git a/pkg/system/bin.go b/pkg/system/bin.go
index e19165455..a37f4576c 100644
--- a/pkg/system/bin.go
+++ b/pkg/system/bin.go
@@ -2,7 +2,7 @@ package system
 
 import "os"
 
-const BinEnvVar = "OTTO_BIN"
+const BinEnvVar = "OTTO8_BIN"
 
 func SetBinToSelf() {
 	if err := os.Setenv(BinEnvVar, Bin()); err != nil {