diff --git a/acceptance/telemetry/upload-command/script b/acceptance/telemetry/upload-command/script
index 7312d8359..053d77b68 100644
--- a/acceptance/telemetry/upload-command/script
+++ b/acceptance/telemetry/upload-command/script
@@ -1,4 +1,4 @@
-export DATABRICKS_CLI_TELEMETRY_UPLOAD_LOGS_FILE=./out.upload.txt
+export DATABRICKS_CLI_TELEMETRY_LOGFILE=./out.upload.txt
 
 # This command / test cannot be run in inprocess / debug mode. This is because
 # it does not go through the [root.Execute] function.
diff --git a/acceptance/telemetry/upload-fails/script b/acceptance/telemetry/upload-fails/script
index a140f0842..e226196ed 100644
--- a/acceptance/telemetry/upload-fails/script
+++ b/acceptance/telemetry/upload-fails/script
@@ -1,5 +1,5 @@
-export DATABRICKS_CLI_TELEMETRY_PID_FILE=./telemetry.pid
-export DATABRICKS_CLI_TELEMETRY_UPLOAD_LOGS_FILE=./out.upload_process.txt
+export DATABRICKS_CLI_TELEMETRY_PIDFILE=./telemetry.pid
+export DATABRICKS_CLI_TELEMETRY_LOGFILE=./out.upload_process.txt
 
 # This test ensures that the main CLI command does not error even if
 # telemetry upload fails.
diff --git a/acceptance/telemetry/upload-partially-succeeds/script b/acceptance/telemetry/upload-partially-succeeds/script
index 5f29f560f..ae4338413 100644
--- a/acceptance/telemetry/upload-partially-succeeds/script
+++ b/acceptance/telemetry/upload-partially-succeeds/script
@@ -1,5 +1,5 @@
-export DATABRICKS_CLI_TELEMETRY_PID_FILE=./telemetry.pid
-export DATABRICKS_CLI_TELEMETRY_UPLOAD_LOGS_FILE=./out.upload_process.txt
+export DATABRICKS_CLI_TELEMETRY_PIDFILE=./telemetry.pid
+export DATABRICKS_CLI_TELEMETRY_LOGFILE=./out.upload_process.txt
 
 trace $CLI selftest send-telemetry
 
diff --git a/acceptance/telemetry/upload-skipped/script b/acceptance/telemetry/upload-skipped/script
index a700f9eae..55fe6c4e2 100644
--- a/acceptance/telemetry/upload-skipped/script
+++ b/acceptance/telemetry/upload-skipped/script
@@ -1,5 +1,5 @@
-export DATABRICKS_CLI_TELEMETRY_PID_FILE=./telemetry.pid
-export DATABRICKS_CLI_TELEMETRY_UPLOAD_LOGS_FILE=./out.upload_process.txt
+export DATABRICKS_CLI_TELEMETRY_PIDFILE=./telemetry.pid
+export DATABRICKS_CLI_TELEMETRY_LOGFILE=./out.upload_process.txt
 export DATABRICKS_CLI_DISABLE_TELEMETRY="true"
 
 trace $CLI selftest send-telemetry
diff --git a/acceptance/telemetry/upload-succeeds-integration/script b/acceptance/telemetry/upload-succeeds-integration/script
index 5f29f560f..ae4338413 100644
--- a/acceptance/telemetry/upload-succeeds-integration/script
+++ b/acceptance/telemetry/upload-succeeds-integration/script
@@ -1,5 +1,5 @@
-export DATABRICKS_CLI_TELEMETRY_PID_FILE=./telemetry.pid
-export DATABRICKS_CLI_TELEMETRY_UPLOAD_LOGS_FILE=./out.upload_process.txt
+export DATABRICKS_CLI_TELEMETRY_PIDFILE=./telemetry.pid
+export DATABRICKS_CLI_TELEMETRY_LOGFILE=./out.upload_process.txt
 
 trace $CLI selftest send-telemetry
 
diff --git a/acceptance/telemetry/upload-succeeds-oauth/script b/acceptance/telemetry/upload-succeeds-oauth/script
index cc958c30a..d1d876762 100644
--- a/acceptance/telemetry/upload-succeeds-oauth/script
+++ b/acceptance/telemetry/upload-succeeds-oauth/script
@@ -1,5 +1,5 @@
-export DATABRICKS_CLI_TELEMETRY_PID_FILE=./telemetry.pid
-export DATABRICKS_CLI_TELEMETRY_UPLOAD_LOGS_FILE=./out.upload_process.txt
+export DATABRICKS_CLI_TELEMETRY_PIDFILE=./telemetry.pid
+export DATABRICKS_CLI_TELEMETRY_LOGFILE=./out.upload_process.txt
 
 # Unset the token which is configured by default
 # in acceptance tests
diff --git a/acceptance/telemetry/upload-succeeds/script b/acceptance/telemetry/upload-succeeds/script
index 5f29f560f..ae4338413 100644
--- a/acceptance/telemetry/upload-succeeds/script
+++ b/acceptance/telemetry/upload-succeeds/script
@@ -1,5 +1,5 @@
-export DATABRICKS_CLI_TELEMETRY_PID_FILE=./telemetry.pid
-export DATABRICKS_CLI_TELEMETRY_UPLOAD_LOGS_FILE=./out.upload_process.txt
+export DATABRICKS_CLI_TELEMETRY_PIDFILE=./telemetry.pid
+export DATABRICKS_CLI_TELEMETRY_LOGFILE=./out.upload_process.txt
 
 trace $CLI selftest send-telemetry
 
diff --git a/libs/telemetry/upload.go b/libs/telemetry/upload.go
index eb2b9c9ae..f92bfef1e 100644
--- a/libs/telemetry/upload.go
+++ b/libs/telemetry/upload.go
@@ -18,18 +18,14 @@ import (
 
 const (
 	// File containing output from the upload process.
-	UploadLogsFileEnvVar = "DATABRICKS_CLI_TELEMETRY_UPLOAD_LOGS_FILE"
+	UploadLogsFileEnvVar = "DATABRICKS_CLI_TELEMETRY_LOGFILE"
 
 	// File containing the PID of the telemetry upload process.
-	PidFileEnvVar = "DATABRICKS_CLI_TELEMETRY_PID_FILE"
+	PidFileEnvVar = "DATABRICKS_CLI_TELEMETRY_PIDFILE"
 
 	// Environment variable to disable telemetry. If this is set to any value, telemetry
 	// will be disabled.
 	DisableEnvVar = "DATABRICKS_CLI_DISABLE_TELEMETRY"
-
-	// Max time to try and upload the telemetry logs. Useful for testing.
-	// TODO: Remove the test case for this.
-	UploadTimeoutEnvVar = "DATABRICKS_CLI_TELEMETRY_UPLOAD_TIMEOUT"
 )
 
 type UploadConfig struct {