diff --git a/website/data/language-nav-data.json b/website/data/language-nav-data.json
index d96dad4d5b..2ff4e8a868 100644
--- a/website/data/language-nav-data.json
+++ b/website/data/language-nav-data.json
@@ -97,7 +97,7 @@
},
{
"title": "The terraform_data
Resource Type",
- "path": "resources/terraform-data"
+ "path": "resources/tf-data"
}
]
},
@@ -917,7 +917,7 @@
"title": "Terraform Settings",
"routes": [
{ "title": "Overview", "path": "settings" },
- { "title": "Terraform Cloud", "path": "settings/terraform-cloud" },
+ { "title": "Terraform Cloud", "path": "settings/tf-cloud" },
{
"title": "Backends",
"routes": [
diff --git a/website/docs/language/meta-arguments/lifecycle.mdx b/website/docs/language/meta-arguments/lifecycle.mdx
index 74a6378ee8..8f92c7f929 100644
--- a/website/docs/language/meta-arguments/lifecycle.mdx
+++ b/website/docs/language/meta-arguments/lifecycle.mdx
@@ -149,7 +149,7 @@ The arguments available within a `lifecycle` block are `create_before_destroy`,
}
```
- `replace_triggered_by` allows only resource addresses because the decision is based on the planned actions for all of the given resources. Plain values such as local values or input variables do not have planned actions of their own, but you can treat them with a resource-like lifecycle by using them with [the `terraform_data` resource type](/terraform/language/resources/terraform-data).
+ `replace_triggered_by` allows only resource addresses because the decision is based on the planned actions for all of the given resources. Plain values such as local values or input variables do not have planned actions of their own, but you can treat them with a resource-like lifecycle by using them with [the `terraform_data` resource type](/terraform/language/resources/tf-data).
## Custom Condition Checks
diff --git a/website/docs/language/resources/provisioners/null_resource.mdx b/website/docs/language/resources/provisioners/null_resource.mdx
index 16c897a1e1..064af06522 100644
--- a/website/docs/language/resources/provisioners/null_resource.mdx
+++ b/website/docs/language/resources/provisioners/null_resource.mdx
@@ -10,7 +10,7 @@ description: >-
If you need to run provisioners that aren't directly associated with a specific
resource, you can associate them with a `terraform_data`.
-Instances of [`terraform_data`](/terraform/language/resources/terraform-data) are treated
+Instances of [`terraform_data`](/terraform/language/resources/tf-data) are treated
like normal resources, but they don't do anything. Like with any other resource
type, you can configure [provisioners](/terraform/language/resources/provisioners/syntax)
and [connection details](/terraform/language/resources/provisioners/connection) on a
diff --git a/website/docs/language/resources/terraform-data.mdx b/website/docs/language/resources/tf-data.mdx
similarity index 100%
rename from website/docs/language/resources/terraform-data.mdx
rename to website/docs/language/resources/tf-data.mdx
diff --git a/website/docs/language/settings/backends/configuration.mdx b/website/docs/language/settings/backends/configuration.mdx
index 321392674b..d13d1b571f 100644
--- a/website/docs/language/settings/backends/configuration.mdx
+++ b/website/docs/language/settings/backends/configuration.mdx
@@ -8,7 +8,7 @@ description: >-
A backend defines where Terraform stores its [state](/terraform/language/state) data files.
-Terraform uses persisted state data to keep track of the resources it manages. Most non-trivial Terraform configurations either [integrate with Terraform Cloud](/terraform/language/settings/terraform-cloud) or use a backend to store state remotely. This lets multiple people access the state data and work together on that collection of infrastructure resources.
+Terraform uses persisted state data to keep track of the resources it manages. Most non-trivial Terraform configurations either [integrate with Terraform Cloud](/terraform/language/settings/tf-cloud) or use a backend to store state remotely. This lets multiple people access the state data and work together on that collection of infrastructure resources.
This page describes how to configure a backend by adding the [`backend` block](#using-a-backend-block) to your configuration.
@@ -25,7 +25,7 @@ Some of these backends act like plain remote disks for state files, while others
## Using a Backend Block
You do not need to configure a backend when using Terraform Cloud because
-Terraform Cloud automatically manages state in the workspaces associated with your configuration. If your configuration includes a [`cloud` block](/terraform/language/settings/terraform-cloud), it cannot include a `backend` block.
+Terraform Cloud automatically manages state in the workspaces associated with your configuration. If your configuration includes a [`cloud` block](/terraform/language/settings/tf-cloud), it cannot include a `backend` block.
To configure a backend, add a nested `backend` block within the top-level
`terraform` block. The following example configures the `remote` backend.
diff --git a/website/docs/language/settings/index.mdx b/website/docs/language/settings/index.mdx
index 906d7e4996..b932de7a15 100644
--- a/website/docs/language/settings/index.mdx
+++ b/website/docs/language/settings/index.mdx
@@ -35,7 +35,7 @@ following sections.
The nested `cloud` block configures Terraform Cloud for enabling its
[CLI-driven run workflow](/terraform/cloud-docs/run/cli).
-- Refer to [Terraform Cloud Configuration](/terraform/language/settings/terraform-cloud) for a summary of the `cloud` block's syntax.
+- Refer to [Terraform Cloud Configuration](/terraform/language/settings/tf-cloud) for a summary of the `cloud` block's syntax.
- Refer to [Using Terraform Cloud](/terraform/cli/cloud) in the
Terraform CLI documentation for complete details about how to initialize and configure the Terraform Cloud CLI integration.
diff --git a/website/docs/language/settings/terraform-cloud.mdx b/website/docs/language/settings/tf-cloud.mdx
similarity index 100%
rename from website/docs/language/settings/terraform-cloud.mdx
rename to website/docs/language/settings/tf-cloud.mdx
diff --git a/website/img/docs/intro-terraform-apis.png b/website/img/docs/intro-opentf-apis.png
similarity index 100%
rename from website/img/docs/intro-terraform-apis.png
rename to website/img/docs/intro-opentf-apis.png
diff --git a/website/img/docs/intro-terraform-workflow.png b/website/img/docs/intro-opentf-workflow.png
similarity index 100%
rename from website/img/docs/intro-terraform-workflow.png
rename to website/img/docs/intro-opentf-workflow.png
diff --git a/website/layouts/language.erb b/website/layouts/language.erb
index c93f429f49..ddeb4d5a54 100644
--- a/website/layouts/language.erb
+++ b/website/layouts/language.erb
@@ -143,7 +143,7 @@