diff --git a/README.rst b/README.rst
index e76f3408..27b9c6f2 100644
--- a/README.rst
+++ b/README.rst
@@ -52,7 +52,7 @@ after their software has been incorporated into the distro or cloud.
 
 **Get involved!**
 
-* Mailing List: fits@OpenStack.org
+* Mailing List: openstack-dev@lists.openstack.org
 * IRC: #refstack on Freenode
 * Dev Meetings: Mondays @ 19:00 UTC in #openstack-meeting-alt on Freenode
 * Web-site: https://refstack.openstack.org
diff --git a/refstack-ui/app/components/about/about.html b/refstack-ui/app/components/about/about.html
index 0d7d0126..c8a8ba39 100644
--- a/refstack-ui/app/components/about/about.html
+++ b/refstack-ui/app/components/about/about.html
@@ -73,9 +73,7 @@
     <strong>Get involved!</strong>
 </p>
 <ul>
-    <li>Mailing List:
-        <a href="mailto:fits%40OpenStack.org">fits@OpenStack.org</a>
-    </li>
+    <li>Mailing List: openstack-dev@lists.openstack.org </li>
     <li>IRC: #refstack on Freenode</li>
     <li>Dev Meetings: Mondays @ 19:00 UTC in #openstack-meeting-alt on Freenode</li>
     <li>Web-site:
diff --git a/refstack-ui/app/components/capabilities/capabilities.html b/refstack-ui/app/components/capabilities/capabilities.html
index a14ba080..a9375843 100644
--- a/refstack-ui/app/components/capabilities/capabilities.html
+++ b/refstack-ui/app/components/capabilities/capabilities.html
@@ -1,4 +1,4 @@
-<h3>DefCore Capabilities</h3>
+<h3>DefCore Guidelines</h3>
 
 <!-- Capability Filters -->
 <div class="row">
diff --git a/refstack-ui/app/components/results-report/resultsReport.html b/refstack-ui/app/components/results-report/resultsReport.html
index b176e154..3be0ef0f 100644
--- a/refstack-ui/app/components/results-report/resultsReport.html
+++ b/refstack-ui/app/components/results-report/resultsReport.html
@@ -33,7 +33,7 @@
     <!-- User Options -->
     <div class="row">
         <div class="col-md-3">
-            <strong>Capabilities Version:</strong>
+            <strong>Guideline Version:</strong>
             <!-- Slicing the version file name here gets rid of the '.json' file extension -->
             <select ng-model="ctrl.version"
                     ng-change="ctrl.updateCapabilities()"
diff --git a/refstack-ui/app/shared/header/header.html b/refstack-ui/app/shared/header/header.html
index 3f2daf12..b6b42e3b 100644
--- a/refstack-ui/app/shared/header/header.html
+++ b/refstack-ui/app/shared/header/header.html
@@ -17,7 +17,7 @@ RefStack
           <ul class="nav navbar-nav">
             <li ng-class="{ active: header.isActive('/')}"><a ui-sref="home">Home</a></li>
             <li ng-class="{ active: header.isActive('/about')}"><a ui-sref="about">About</a></li>
-            <li ng-class="{ active: header.isActive('/capabilities')}"><a ui-sref="capabilities">DefCore Capabilities</a></li>
+            <li ng-class="{ active: header.isActive('/capabilities')}"><a ui-sref="capabilities">DefCore Guidelines</a></li>
             <li ng-class="{ active: header.isActive('/community_results')}"><a ui-sref="communityResults">Community Results</a></li>
           </ul>
           <ul class="nav navbar-nav navbar-right">