diff --git a/README.rst b/README.rst
index 86e5a88f..95216435 100644
--- a/README.rst
+++ b/README.rst
@@ -27,15 +27,15 @@ refstack-client, that helps to verify interoperability of their cloud
 with other OpenStack clouds. It does so by validating any cloud
 implementation against the OpenStack Tempest API tests.
 
-**RefStack and DefCore** - The prototypical use case for RefStack provides
-the DefCore Committee the tools for vendors and other users to run API
-tests against their clouds to provide the DefCore committee with a reliable
-overview of what APIs and capabilities are being used in the marketplace.
-This will help to guide the DefCore-defined capabilities and help ensure
-interoperability across the entire OpenStack ecosystem. It can also
-be used to validate clouds against existing DefCore capability lists,
-giving you assurance that your cloud faithfully implements OpenStack
-standards.
+**RefStack and Interop Working Group** - The prototypical use case for RefStack
+provides the Interop Working Group - formerly known as DefCore committee - the
+tools for vendors and other users to run API tests against their clouds to
+provide the WG with a reliable overview of what APIs and capabilities are
+being used in the marketplace. This will help to guide the Interop
+Working Group defined capabilities and help ensure interoperability across
+the entire OpenStack ecosystem. It can also be used to validate clouds
+against existing capability lists, giving you assurance that your cloud
+faithfully implements OpenStack standards.
 
 **Value add for vendors** - Vendors can use RefStack to demonstrate that
 their distros, and/or their customers' installed clouds remain with OpenStack
@@ -53,7 +53,8 @@ after their software has been incorporated into the distro or cloud.
    * reviews: https://review.openstack.org/#q,status:open+refstack,n,z
 
 * **refstack-client**
-   refstack-client contains the tools you will need to run the DefCore tests.
+   refstack-client contains the tools you will need to run the
+   Interop Working Group tests.
 
    * repository: http://git.openstack.org/cgit/openstack/refstack-client
    * reviews: https://review.openstack.org/#q,status:open+refstack-client,n,z
diff --git a/etc/refstack.conf.sample b/etc/refstack.conf.sample
index bb349fe3..00d6cf32 100644
--- a/etc/refstack.conf.sample
+++ b/etc/refstack.conf.sample
@@ -139,15 +139,15 @@
 # Template for test result url. (string value)
 #test_results_url = /#/results/%s
 
-# The GitHub API URL of the repository and location of the DefCore
-# capability files. This URL is used to get a listing of all
-# capability files. (string value)
-#github_api_capabilities_url = https://api.github.com/repos/openstack/defcore/contents
+# The GitHub API URL of the repository and location of the
+# Interop Working Group capability files.
+# This URL is used to get a listing of all capability files. (string value)
+#github_api_capabilities_url = https://api.github.com/repos/openstack/interop/contents
 
 # This is the base URL that is used for retrieving specific capability
 # files. Capability file names will be appended to this URL to get the
 # contents of that file. (string value)
-#github_raw_base_url = https://raw.githubusercontent.com/openstack/defcore/master/
+#github_raw_base_url = https://raw.githubusercontent.com/openstack/interop/master/
 
 # Number of results for one page (integer value)
 #results_per_page = 20
diff --git a/refstack-ui/app/components/guidelines/guidelines.html b/refstack-ui/app/components/guidelines/guidelines.html
index 06ba6e3a..1dd39ff1 100644
--- a/refstack-ui/app/components/guidelines/guidelines.html
+++ b/refstack-ui/app/components/guidelines/guidelines.html
@@ -1,4 +1,4 @@
-<h3>DefCore Guidelines</h3>
+<h3>OpenStack Powered&#8482; Guidelines</h3>
 
 <!-- Guideline Filters -->
 <div class="row">
@@ -64,7 +64,7 @@
 </div>
 <!-- End Capability Filters -->
 
-<p><small>Tests marked with <span class="glyphicon glyphicon-flag text-warning"></span> are tests flagged by DefCore.</small></p>
+<p><small>Tests marked with <span class="glyphicon glyphicon-flag text-warning"></span> are tests flagged by Interop Working Group.</small></p>
 
 <!-- Loading animation divs -->
 <div cg-busy="{promise:ctrl.versionsRequest,message:'Loading versions'}"></div>
diff --git a/refstack-ui/app/components/guidelines/guidelinesController.js b/refstack-ui/app/components/guidelines/guidelinesController.js
index 2153911d..7236d873 100644
--- a/refstack-ui/app/components/guidelines/guidelinesController.js
+++ b/refstack-ui/app/components/guidelines/guidelinesController.js
@@ -24,7 +24,7 @@
     /**
      * RefStack Guidelines Controller
      * This controller is for the '/guidelines' page where a user can browse
-     * through tests belonging to DefCore-defined capabilities.
+     * through tests belonging to Interop WG defined capabilities.
      */
     function GuidelinesController($http, $uibModal, refstackApiUrl) {
         var ctrl = this;
@@ -99,7 +99,7 @@
         /**
          * This will update the scope's 'targetCapabilities' object with
          * capabilities belonging to the selected OpenStack marketing program
-         * (programs typically correspond to 'components' in the DefCore
+         * (programs typically correspond to 'components' in the Interop WG
          * schema). Each capability will have its status mapped to it.
          */
         function updateTargetCapabilities() {
@@ -227,7 +227,7 @@
     /**
      * Test List Modal Controller
      * This controller is for the modal that appears if a user wants to see the
-     * test list corresponding to DefCore capabilities with the selected
+     * test list corresponding to Interop WG capabilities with the selected
      * statuses.
      */
     function TestListModalController($uibModalInstance, $http, version,
diff --git a/refstack-ui/app/components/guidelines/partials/guidelineDetails.html b/refstack-ui/app/components/guidelines/partials/guidelineDetails.html
index c0a9f49b..f020c9a0 100644
--- a/refstack-ui/app/components/guidelines/partials/guidelineDetails.html
+++ b/refstack-ui/app/components/guidelines/partials/guidelineDetails.html
@@ -1,5 +1,5 @@
 <!--
-HTML for guidelines page for all Defcore guideline schemas
+HTML for guidelines page for all OpenStack Powered (TM) guideline schemas
 This expects the JSON data of the guidelines file to be stored in scope
 variable 'guidelines'.
 -->
diff --git a/refstack-ui/app/components/guidelines/partials/testListModal.html b/refstack-ui/app/components/guidelines/partials/testListModal.html
index cd57ea0b..46813f6f 100644
--- a/refstack-ui/app/components/guidelines/partials/testListModal.html
+++ b/refstack-ui/app/components/guidelines/partials/testListModal.html
@@ -3,7 +3,7 @@
         <button type="button" class="close" aria-hidden="true" ng-click="modal.close()">&times;</button>
         <h4>Test List ({{modal.testListCount}})</h4>
         <p>Use this test list with <a title="refstack-client" target="_blank"href="https://github.com/openstack/refstack-client">refstack-client</a>
-           to run only tests in the {{modal.version}} DefCore guideline from capabilities with the following statuses:
+           to run only tests in the {{modal.version}} OpenStack Powered&#8482; guideline from capabilities with the following statuses:
         </p>
         <ul class="list-inline">
             <li class="required" ng-if="modal.status.required"> Required</li>
diff --git a/refstack-ui/app/components/products/productController.js b/refstack-ui/app/components/products/productController.js
index ab70b419..80776661 100644
--- a/refstack-ui/app/components/products/productController.js
+++ b/refstack-ui/app/components/products/productController.js
@@ -54,7 +54,7 @@
             $state.go('home');
         }
 
-        /** Mappings of DefCore components to marketing program names. */
+        /** Mappings of Interop WG components to marketing program names. */
         ctrl.targetMappings = {
             'platform': 'Openstack Powered Platform',
             'compute': 'OpenStack Powered Compute',
diff --git a/refstack-ui/app/components/results-report/resultsReport.html b/refstack-ui/app/components/results-report/resultsReport.html
index 6e17c786..5527121b 100644
--- a/refstack-ui/app/components/results-report/resultsReport.html
+++ b/refstack-ui/app/components/results-report/resultsReport.html
@@ -64,7 +64,7 @@
 </div>
 
 <div ng-show="ctrl.resultsData">
-    <p>See how these results stack up against DefCore capabilities and OpenStack
+    <p>See how these results stack up against Interop Working Group capabilities and OpenStack
         <a target="_blank" href="http://www.openstack.org/brand/interop/">target marketing programs.</a>
     </p>
 
diff --git a/refstack-ui/app/components/results-report/resultsReportController.js b/refstack-ui/app/components/results-report/resultsReportController.js
index 68108853..158abb55 100644
--- a/refstack-ui/app/components/results-report/resultsReportController.js
+++ b/refstack-ui/app/components/results-report/resultsReportController.js
@@ -61,7 +61,7 @@
         /** The target OpenStack marketing program to compare against. */
         ctrl.target = 'platform';
 
-        /** Mappings of DefCore components to marketing program names. */
+        /** Mappings of Interop WG components to marketing program names. */
         ctrl.targetMappings = {
             'platform': 'Openstack Powered Platform',
             'compute': 'OpenStack Powered Compute',
@@ -494,7 +494,7 @@
 
                 // Return a generic message since schema 1.2 does not
                 // provide flag reasons.
-                return 'DefCore has flagged this test.';
+                return 'Interop Working Group has flagged this test.';
             }
             else if ((ctrl.schemaVersion >= '1.3') &&
                 (ctrl.isTestFlagged(test, capObj))) {
diff --git a/refstack-ui/app/components/results/resultsController.js b/refstack-ui/app/components/results/resultsController.js
index 7b4aed11..14ebbb25 100644
--- a/refstack-ui/app/components/results/resultsController.js
+++ b/refstack-ui/app/components/results/resultsController.js
@@ -43,7 +43,7 @@
         ctrl.getProductVersions = getProductVersions;
         ctrl.prepVersionEdit = prepVersionEdit;
 
-        /** Mappings of DefCore components to marketing program names. */
+        /** Mappings of Interop WG components to marketing program names. */
         ctrl.targetMappings = {
             'platform': 'Openstack Powered Platform',
             'compute': 'OpenStack Powered Compute',
diff --git a/refstack-ui/app/shared/header/header.html b/refstack-ui/app/shared/header/header.html
index 5dcf09a6..d94390fb 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('/guidelines')}"><a ui-sref="guidelines">DefCore Guidelines</a></li>
+            <li ng-class="{ active: header.isActive('/guidelines')}"><a ui-sref="guidelines">OpenStack Powered&#8482; Guidelines</a></li>
             <li ng-class="{ active: header.isActive('/community_results')}"><a ui-sref="communityResults">Community Results</a></li>
             <!--
             <li ng-class="{ active: header.isCatalogActive('public')}" class="dropdown" uib-dropdown>
diff --git a/refstack-ui/tests/unit/ControllerSpec.js b/refstack-ui/tests/unit/ControllerSpec.js
index 77f77889..d9a0f968 100644
--- a/refstack-ui/tests/unit/ControllerSpec.js
+++ b/refstack-ui/tests/unit/ControllerSpec.js
@@ -608,7 +608,7 @@ describe('Refstack controllers', function () {
 
                 ctrl.schemaVersion = '1.2';
                 expect(ctrl.getFlaggedReason('test1', capObj)).toEqual(
-                    'DefCore has flagged this test.');
+                    'Interop Working Group has flagged this test.');
 
                 // Check that non-flagged test returns empty string.
                 expect(ctrl.getFlaggedReason('test2', capObj)).toEqual('');
diff --git a/refstack/api/app.py b/refstack/api/app.py
index 1109fba4..770c6692 100644
--- a/refstack/api/app.py
+++ b/refstack/api/app.py
@@ -83,14 +83,14 @@ API_OPTS = [
                ),
     cfg.StrOpt('github_api_capabilities_url',
                default='https://api.github.com'
-                       '/repos/openstack/defcore/contents',
-               help='The GitHub API URL of the repository and location of '
-                    'the DefCore capability files. This URL is used to get '
-                    'a listing of all capability files.'
+                       '/repos/openstack/interop/contents',
+               help='The GitHub API URL of the repository and location of the '
+                    'Interop Working Group capability files. This URL is used '
+                    'to get a listing of all capability files.'
                ),
     cfg.StrOpt('github_raw_base_url',
                default='https://raw.githubusercontent.com'
-                       '/openstack/defcore/master/',
+                       '/openstack/interop/master/',
                help='This is the base URL that is used for retrieving '
                     'specific capability files. Capability file names will '
                     'be appended to this URL to get the contents of that file.'
diff --git a/refstack/api/controllers/guidelines.py b/refstack/api/controllers/guidelines.py
index 6ee5fd76..acefafa7 100644
--- a/refstack/api/controllers/guidelines.py
+++ b/refstack/api/controllers/guidelines.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-"""Defcore guidelines controller."""
+"""Interop WG guidelines controller."""
 
 import pecan
 from pecan import rest
@@ -70,7 +70,7 @@ class GuidelinesController(rest.RestController):
     """/v1/guidelines handler.
 
     This acts as a proxy for retrieving guideline files
-    from the openstack/defcore Github repository.
+    from the openstack/interop Github repository.
     """
 
     tests = TestsController()
diff --git a/refstack/api/guidelines.py b/refstack/api/guidelines.py
index d4a8e582..40fd42cd 100644
--- a/refstack/api/guidelines.py
+++ b/refstack/api/guidelines.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-"""Class for retrieving DefCore guideline information."""
+"""Class for retrieving Interop WG guideline information."""
 
 from oslo_config import cfg
 from oslo_log import log