diff --git a/etc/default_data.json b/etc/default_data.json
index 4a357bf94..499b9faed 100644
--- a/etc/default_data.json
+++ b/etc/default_data.json
@@ -46262,7 +46262,7 @@
             "refs": {
                 "governance": {
                     "type": "big_tent",
-                    "source": "https://opendev.org/openstack/governance/raw/tag/0.8.0/reference/projects.yaml"
+                    "source": "https://opendev.org/openstack/governance/raw/branch/master/reference/projects.yaml"
                 }
             },
             "project": "openstack"
@@ -46317,24 +46317,18 @@
     "project_types": [
         {
             "id": "all",
-            "title": "OpenStack",
+            "title": "OpenInfra",
             "modules": ["openstack", "airship", "zuul", "unknown"]
         },
         {
             "id": "openstack",
-            "title": "Official",
+            "title": "OpenStack",
             "child": true,
             "modules": [
                 "openstack-official", "governance", "openstack-user-stories",
                 "edge-computing", "leveraging-containers-openstack"
             ]
         },
-        {
-            "id": "tc:approved-release",
-            "title": "TC-approved",
-            "child": true,
-            "modules": ["tc:approved-release"]
-        },
         {
             "id": "airship-type",
             "title": "Airship",
diff --git a/stackalytics/dashboard/templates/_macros/activity_log.html b/stackalytics/dashboard/templates/_macros/activity_log.html
index 06314045a..3047f6a9e 100644
--- a/stackalytics/dashboard/templates/_macros/activity_log.html
+++ b/stackalytics/dashboard/templates/_macros/activity_log.html
@@ -197,7 +197,7 @@ show_twitter=False) -%}
             <div>Status: <span class="status${status_class}">${status}</span></div>
             <div>Importance: <span class="importance${importance}">${importance}</span></div>
         {%elif record_type == "member" %}
-            <div class="header"><a href="${member_uri}" target="_blank">Registered</a> in OpenStack Foundation</div>
+            <div class="header"><a href="${member_uri}" target="_blank">Registered</a> in OpenInfra Foundation</div>
         {%elif record_type == "tr" %}
             <div class="header">Translated ${loc} words into ${language}</div>
         {%/if%}
diff --git a/stackalytics/dashboard/templates/cncf_layout.html b/stackalytics/dashboard/templates/cncf_layout.html
index cb2d227c7..ae83789d9 100644
--- a/stackalytics/dashboard/templates/cncf_layout.html
+++ b/stackalytics/dashboard/templates/cncf_layout.html
@@ -48,7 +48,7 @@
                     <div class="col-lg-8">
                         <div class="stackamenu text-center">
                             <ul id="menu-stackamenu" class="list-inline">
-                                <li class="list-inline-item"><a href="/"><span class="menu-item">OpenStack Foundation</span></a></li>
+                                <li class="list-inline-item"><a href="/"><span class="menu-item">OpenInfra Foundation</span></a></li>
                                 <li class="list-inline-item current-menu-item"><a href="/cncf"><span class="menu-item">CNCF</span></a></li>
                                 <li class="list-inline-item"><a href="/unaffiliated"><span class="menu-item">Other Projects</span></a></li>
                             </ul>
diff --git a/stackalytics/dashboard/templates/layout.html b/stackalytics/dashboard/templates/layout.html
index 93feb0521..eca26b06f 100644
--- a/stackalytics/dashboard/templates/layout.html
+++ b/stackalytics/dashboard/templates/layout.html
@@ -48,7 +48,7 @@
                     <div class="col-lg-8">
                         <div class="stackamenu text-center">
                             <ul id="menu-stackamenu" class="list-inline">
-                                <li class="list-inline-item current-menu-item"><a href="/"><span class="menu-item">OpenStack Foundation</span></a></li>
+                                <li class="list-inline-item current-menu-item"><a href="/"><span class="menu-item">OpenInfra Foundation</span></a></li>
                                 <li class="list-inline-item"><a href="/cncf"><span class="menu-item">CNCF</span></a></li>
                                 <li class="list-inline-item"><a href="/unaffiliated"><span class="menu-item">Other Projects</span></a></li>
                             </ul>
diff --git a/stackalytics/dashboard/templates/reports/driverlog.html b/stackalytics/dashboard/templates/reports/driverlog.html
index a2c136d7a..dafccadd2 100644
--- a/stackalytics/dashboard/templates/reports/driverlog.html
+++ b/stackalytics/dashboard/templates/reports/driverlog.html
@@ -36,7 +36,7 @@
             <div class="col-lg-8">
                 <div class="stackamenu text-center">
                     <ul id="menu-stackamenu" class="list-inline">
-                        <li class="list-inline-item current-menu-item"><a href="/"><span class="menu-item">OpenStack Foundation</span></a></li>
+                        <li class="list-inline-item current-menu-item"><a href="/"><span class="menu-item">OpenInfra Foundation</span></a></li>
                         <li class="list-inline-item"><a href="/?project_type=cncf-group&amp;release=all&amp;metric=commits"><span class="menu-item">CNCF</span></a></li>
                         <li class="list-inline-item"><a href="/unaffiliated"><span class="menu-item">Unaffiliated Projects</span></a></li>
                     </ul>
diff --git a/stackalytics/dashboard/templates/reports/members.html b/stackalytics/dashboard/templates/reports/members.html
index 634a792f7..9268d762a 100644
--- a/stackalytics/dashboard/templates/reports/members.html
+++ b/stackalytics/dashboard/templates/reports/members.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% set active_tab = 'members' %}
-{% set page_title = 'OpenStack Foundation members' %}
+{% set page_title = 'OpenInfra Foundation members' %}
 
 {% block head %}
 <script type="text/javascript">
@@ -349,7 +349,7 @@
         <div class="row">
             <div class="col-lg-6">
                 <div id="companies_container">
-                    <h2>OpenStack foundation member companies</h2>
+                    <h2>OpenInfra foundation member companies</h2>
 
                     <table id="companies_table">
                         <thead>
diff --git a/stackalytics/dashboard/templates/unaffiliated_layout.html b/stackalytics/dashboard/templates/unaffiliated_layout.html
index 4c374328d..6558db477 100644
--- a/stackalytics/dashboard/templates/unaffiliated_layout.html
+++ b/stackalytics/dashboard/templates/unaffiliated_layout.html
@@ -48,7 +48,7 @@
                     <div class="col-lg-8">
                         <div class="stackamenu text-center">
                             <ul id="menu-stackamenu" class="list-inline">
-                                <li class="list-inline-item"><a href="/"><span class="menu-item">OpenStack Foundation</span></a></li>
+                                <li class="list-inline-item"><a href="/"><span class="menu-item">OpenInfra Foundation</span></a></li>
                                 <li class="list-inline-item"><a href="/cncf"><span class="menu-item">CNCF</span></a></li>
                                 <li class="list-inline-item current-menu-item"><a href="/unaffiliated"><span class="menu-item">Other Projects</span></a></li>
                             </ul>