diff --git a/website/layouts/docs.erb b/website/layouts/docs.erb
index 381b1c1b6f..4802440c2f 100644
--- a/website/layouts/docs.erb
+++ b/website/layouts/docs.erb
@@ -1,6 +1,6 @@
 <% wrap_layout :inner do %>
   <% content_for :sidebar do %>
-    <h4><a href="/docs/cli/index.html">Terraform CLI</a></h4>
+    <h4><a href="/docs/cli/index.html">OpenTF CLI</a></h4>
 
     <ul class="nav docs-sidenav">
 
@@ -335,14 +335,14 @@
       </li>
 
       <li>
-        <a href="#">Using Terraform Cloud</a>
+        <a href="#">Using Cloud Backends</a>
         <ul class="nav">
           <li>
             <a href="/docs/cli/cloud/index.html">Overview</a>
           </li>
 
           <li>
-            <a href="/docs/cli/cloud/settings.html">Terraform Cloud Settings</a>
+            <a href="/docs/cli/cloud/settings.html">Cloud Backend Settings</a>
           </li>
 
           <li>
@@ -355,25 +355,6 @@
         </ul>
       </li>
 
-      <li>
-        <a href="#">Automating Terraform</a>
-        <ul class="nav">
-          <li>
-            <a href="https://learn.hashicorp.com/tutorials/terraform/automate-terraform?in=terraform/automation&utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS">
-              Running Terraform in Automation
-              <img src="/assets/images/outbound-link.svg" width="20" height="20" aria-hidden="true" style="vertical-align: text-bottom;">
-            </a>
-          </li>
-
-          <li>
-            <a href="https://learn.hashicorp.com/tutorials/terraform/github-actions?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS">
-              GitHub Actions
-              <img src="/assets/images/outbound-link.svg" width="20" height="20" aria-hidden="true" style="vertical-align: text-bottom;">
-            </a>
-          </li>
-        </ul>
-      </li>
-
       <li>
         <a href="#">Alphabetical List of Commands</a>
         <ul class="nav">
@@ -552,7 +533,7 @@
           </li>
 
           <li>
-            <a href="/docs/internals/debugging.html">Debugging Terraform</a>
+            <a href="/docs/internals/debugging.html">Debugging OpenTF</a>
           </li>
 
           <li>
@@ -596,7 +577,7 @@
 
     </ul>
 
-    <%= partial("layouts/otherdocs", :locals => { :skip => "Terraform CLI" }) %>
+    <%= partial("layouts/otherdocs", :locals => { :skip => "OpenTF CLI" }) %>
   <% end %>
 
   <%= yield %>
diff --git a/website/layouts/downloads.erb b/website/layouts/downloads.erb
index 8fa057cffd..d567c3c80f 100644
--- a/website/layouts/downloads.erb
+++ b/website/layouts/downloads.erb
@@ -4,7 +4,7 @@
 
     <ul class="nav docs-sidenav">
       <li<%= sidebar_current("downloads-terraform") %>>
-        <a href="/downloads.html">Download Terraform</a>
+        <a href="/downloads.html">Download OpenTF</a>
       </li>
 
       <li<%= sidebar_current("docs-cli-install-apt") %>>
@@ -20,7 +20,7 @@
       </li>
     </ul>
 
-    <%= partial("layouts/otherdocs", :locals => { :skip => "Download Terraform" }) %>
+    <%= partial("layouts/otherdocs", :locals => { :skip => "Download OpenTF" }) %>
   <% end %>
 
   <%= yield %>
diff --git a/website/layouts/intro.erb b/website/layouts/intro.erb
index fb528b50d4..1e7422aa93 100644
--- a/website/layouts/intro.erb
+++ b/website/layouts/intro.erb
@@ -5,11 +5,11 @@
   <% end %>
 
   <% content_for :sidebar do %>
-    <h4><a href="/intro/index.html">Introduction to Terraform</a></h4>
+    <h4><a href="/intro/index.html">Introduction to OpenTF</a></h4>
 
     <ul class="nav docs-sidenav">
       <li>
-        <a href="/intro/index.html">What is Terraform?</a>
+        <a href="/intro/index.html">What is OpenTF?</a>
       </li>
 
       <li>
@@ -17,14 +17,10 @@
       </li>
 
       <li>
-        <a href="https://learn.hashicorp.com/collections/terraform/aws-get-started?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS">Getting Started</a>
+        <a href="/guides/core-workflow.html">The Core OpenTF Workflow</a>
       </li>
 
-      <li>
-        <a href="/guides/core-workflow.html">The Core Terraform Workflow</a>
-      </li>
-
-      <li><a href="/docs/cloud/guides/recommended-practices/index.html">Terraform Recommended Practices</a>
+      <li><a href="/docs/cloud/guides/recommended-practices/index.html">OpenTF Recommended Practices</a>
         <ul class="nav">
           <li><a href="/docs/cloud/guides/recommended-practices/part1.html">Part 1: Workflow Overview</a></li>
           <li><a href="/docs/cloud/guides/recommended-practices/part2.html">Part 2: Evaluating Current Practices</a></li>
@@ -37,7 +33,7 @@
       </li>
 
       <li>
-        <a href="/intro/vs/index.html">Terraform vs. Other</a>
+        <a href="/intro/vs/index.html">OpenTF vs. Other</a>
         <ul class="nav">
           <li>
             <a href="/intro/vs/chef-puppet.html">Chef, Puppet, etc.</a>
@@ -55,7 +51,7 @@
       </li>
     </ul>
 
-    <%= partial("layouts/otherdocs", :locals => { :skip => "Introduction to Terraform" }) %>
+    <%= partial("layouts/otherdocs", :locals => { :skip => "Introduction to OpenTF" }) %>
   <% end %>
 
   <%= yield %>
diff --git a/website/layouts/language.erb b/website/layouts/language.erb
index ddeb4d5a54..aade3aaddb 100644
--- a/website/layouts/language.erb
+++ b/website/layouts/language.erb
@@ -1,6 +1,6 @@
 <% wrap_layout :inner do %>
   <% content_for :sidebar do %>
-    <h4><a href="/docs/language/index.html">Terraform Language</a></h4>
+    <h4><a href="/docs/language/index.html">OpenTF Language</a></h4>
 
     <ul class="nav docs-sidenav">
 
@@ -143,7 +143,7 @@
           </li>
 
           <li>
-            <a href="/docs/language/resources/tf-data.html">Terraform Data Resource Type</a>
+            <a href="/docs/language/resources/tf-data.html">OpenTF Data Resource Type</a>
           </li>
 
         </ul>
@@ -860,14 +860,14 @@
       </li><!-- function reference -->
 
       <li>
-        <a href="#">Terraform Settings</a>
+        <a href="#">OpenTF Settings</a>
         <ul class="nav">
           <li>
             <a href="/docs/language/settings/index.html">Overview</a>
           </li>
 
           <li>
-            <a href="/docs/language/settings/tf-cloud.html">Terraform Cloud</a>
+            <a href="/docs/language/settings/tf-cloud.html">Cloud Backend</a>
           </li>
 
           <li>
@@ -1075,17 +1075,13 @@
           </li>
 
           <li>
-            <a href="/docs/configuration-0-11/terraform.html">Terraform</a>
+            <a href="/docs/configuration-0-11/terraform.html">OpenTF</a>
           </li>
 
           <li>
             <a href="/docs/language/resources/provisioners/index.html">Provisioners</a>
           </li>
 
-          <li>
-            <a href="/docs/configuration-0-11/terraform-enterprise.html">Terraform Push (deprecated)</a>
-          </li>
-
           <li>
             <a href="/docs/configuration-0-11/environment-variables.html">Environment Variables</a>
           </li>
@@ -1094,7 +1090,7 @@
 
     </ul>
 
-    <%= partial("layouts/otherdocs", :locals => { :skip => "Terraform Language" }) %>
+    <%= partial("layouts/otherdocs", :locals => { :skip => "OpenTF Language" }) %>
   <% end %>
 
   <%= yield %>