diff --git a/internal/addrs/terraform_attr.go b/internal/addrs/tf_attr.go
similarity index 100%
rename from internal/addrs/terraform_attr.go
rename to internal/addrs/tf_attr.go
diff --git a/scripts/debug-terraform b/scripts/debug-opentf
similarity index 82%
rename from scripts/debug-terraform
rename to scripts/debug-opentf
index 4d8070e5ed..e52d998717 100755
--- a/scripts/debug-terraform
+++ b/scripts/debug-opentf
@@ -10,10 +10,10 @@
 #    https://github.com/derekparker/delve/tree/master/Documentation/installation
 #
 # For more convenient use, you may wish to put this script in your PATH:
-#    ln -s ../src/github.com/placeholderplaceholderplaceholder/opentf/scripts/debug-terraform $GOPATH/bin/debug-terraform
+#    ln -s ../src/github.com/placeholderplaceholderplaceholder/opentf/scripts/debug-opentf $GOPATH/bin/debug-opentf
 #
-# Note that when running this script the Terraform binary is NOT in $GOPATH/bin,
-# so any providers installed there won't be found unless Terraform searches
+# Note that when running this script the OpenTF binary is NOT in $GOPATH/bin,
+# so any providers installed there won't be found unless OpenTF searches
 # there for some _other_ reason.
 
 set -eu