diff --git a/cmd/bump-version/main.go b/cmd/bump-version/main.go
index 2e9f2e4..5d9f0c0 100644
--- a/cmd/bump-version/main.go
+++ b/cmd/bump-version/main.go
@@ -59,7 +59,7 @@ const headerFile = `#!/bin/bash
 
 # This file is generated by an utility called bump-version in
 # tinkerbell/sandbox.
-# This file gets used from generate-envrc.sh but it is also used standalone by
+# This file gets used from generate-env.sh but it is also used standalone by
 # automation that wants to get the version of the programs currently supported
 # in sandbox
 
diff --git a/current_versions.sh b/current_versions.sh
index b72e412..ac19d76 100644
--- a/current_versions.sh
+++ b/current_versions.sh
@@ -2,7 +2,7 @@
 
 # This file is generated by an utility called bump-version in
 # tinkerbell/sandbox.
-# This file gets used from generate-envrc.sh but it is also used standalone by
+# This file gets used from generate-env.sh but it is also used standalone by
 # automation that wants to get the version of the programs currently supported
 # in sandbox
 
diff --git a/deploy/terraform/main.tf b/deploy/terraform/main.tf
index 0e99467..118ed90 100644
--- a/deploy/terraform/main.tf
+++ b/deploy/terraform/main.tf
@@ -57,8 +57,8 @@ resource "null_resource" "tink_directory" {
   }
 
   provisioner "file" {
-    source      = "../../generate-envrc.sh"
-    destination = "/root/tink/generate-envrc.sh"
+    source      = "../../generate-env.sh"
+    destination = "/root/tink/generate-env.sh"
   }
 
   provisioner "file" {
diff --git a/deploy/vagrant/scripts/tinkerbell.sh b/deploy/vagrant/scripts/tinkerbell.sh
index 65c7c3b..290fcfb 100644
--- a/deploy/vagrant/scripts/tinkerbell.sh
+++ b/deploy/vagrant/scripts/tinkerbell.sh
@@ -35,7 +35,7 @@ main() (
 	export DEBIAN_FRONTEND=noninteractive
 
 	if [ ! -f ./.env ]; then
-		./generate-envrc.sh eth1 >.env
+		./generate-env.sh eth1 >.env
 	fi
 
 	# shellcheck disable=SC1091
diff --git a/generate-envrc.sh b/generate-env.sh
similarity index 98%
rename from generate-envrc.sh
rename to generate-env.sh
index a6f89c3..e6fb304 100755
--- a/generate-envrc.sh
+++ b/generate-env.sh
@@ -44,7 +44,7 @@ generate_password() (
 	head -c 12 /dev/urandom | sha256sum | cut -d' ' -f1
 )
 
-generate_envrc() (
+generate_env() (
 	local tink_interface=$1
 
 	validate_tinkerbell_network_interface "$tink_interface"
@@ -99,7 +99,7 @@ main() (
 		exit 1
 	fi
 
-	generate_envrc "$1"
+	generate_env "$1"
 )
 
 main "$@"
diff --git a/setup.sh b/setup.sh
index 7e7a2b5..5680601 100755
--- a/setup.sh
+++ b/setup.sh
@@ -490,7 +490,7 @@ do_setup() (
 	check_prerequisites "$lsb_dist" "$lsb_version"
 
 	if [ ! -f "$ENV_FILE" ]; then
-		echo "$ERR Run './generate-envrc.sh network-interface > \"$ENV_FILE\"' before continuing."
+		echo "$ERR Run './generate-env.sh network-interface > \"$ENV_FILE\"' before continuing."
 		exit 1
 	fi