fix: do not break up strings so l10n works properly

doc: Add clarifying translator's notes for edX-specific messages
fix(deps): update dependency @edx/frontend-platform to v1.12.6
2021-09-23 13:55:51 -06:00 · 2021-09-23 13:25:09 -06:00 · 2021-09-13 10:16:42 +00:00 · 2021-09-13 09:59:52 +00:00 · 2021-09-08 10:57:46 -04:00 · 2021-09-06 08:39:07 +00:00
55 changed files with 7258 additions and 8549 deletions
--- a/.env
+++ b/.env
@@ -13,7 +13,7 @@ NODE_ENV=null
 ORDER_HISTORY_URL=null
 REFRESH_ACCESS_TOKEN_ENDPOINT=null
 SEGMENT_KEY=null
-SITE_NAME=null
+SITE_NAME=''
 SUPPORT_URL=null
 USER_INFO_COOKIE_NAME=null
 LOGO_URL=''
--- a/.env.development
+++ b/.env.development
@@ -14,12 +14,11 @@ ORDER_HISTORY_URL='localhost:1996/orders'
 PORT=1997
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
 SEGMENT_KEY=null
-SITE_NAME='edX'
+SITE_NAME=localhost
 SUPPORT_URL='http://localhost:18000/support'
 USER_INFO_COOKIE_NAME='edx-user-info'
-# Temporary, Remove this once we are ready to release the feature.
-COACHING_ENABLED=true
-ENABLE_DEMOGRAPHICS_COLLECTION=true
+COACHING_ENABLED=false
+ENABLE_DEMOGRAPHICS_COLLECTION=false
 LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
 LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
 LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
--- a/.env.test
+++ b/.env.test
@@ -13,7 +13,7 @@ NODE_ENV=null
 ORDER_HISTORY_URL='localhost:1996/orders'
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
 SEGMENT_KEY=null
-SITE_NAME='edX'
+SITE_NAME=localhost
 SUPPORT_URL='http://localhost:18000/support'
 USER_INFO_COOKIE_NAME='edx-user-info'
 COACHING_ENABLED=''
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @edx/community-engineering
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,32 @@
+---
+name: ci
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version:
+        - 12
+        npm-test:
+        - i18n_extract
+        - is-es5
+        - lint
+        - test
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm install -g npm@6
+    - run: make requirements
+    - run: make test NPM_TESTS=build
+    - run: make test NPM_TESTS=${{ matrix.npm-test }}
+    - name: upload coverage
+      uses: codecov/codecov-action@v2
+      with:
+        fail_ci_if_error: false
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +0,0 @@
-language: node_js
-node_js: 12
-before_install:
- npm install -g npm@6
-install:
- npm ci
-script:
- make validate-no-uncommitted-package-lock-changes
- npm run i18n_extract
- npm run lint
- npm run test
- npm run build
- npm run is-es5
-after_success:
- codecov
--- a/15
+++ b/15
@@ -10,8 +10,19 @@ tx_url2 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transi
 # This directory must match .babelrc .
 transifex_temp = ./temp/babel-plugin-react-intl

-requirements:
-	npm install
+NPM_TESTS=build i18n_extract lint test is-es5
+
+.PHONY: test
+test: $(addprefix test.npm.,$(NPM_TESTS))  ## validate ci suite
+
+.PHONY: test.npm.*
+test.npm.%: validate-no-uncommitted-package-lock-changes
+	test -d node_modules || $(MAKE) requirements
+	npm run $(*)
+
+.PHONY: requirements
+requirements:  ## install ci requirements
+	npm ci

 i18n.extract:
 	# Pulling display strings from .jsx files into .json files...
--- a/README.rst
+++ b/README.rst
@@ -1,48 +1,110 @@
-|Build Status| |Codecov| |npm_version| |npm_downloads| |license| |semantic-release|
+|ci-badge| |Codecov| |npm_version| |npm_downloads| |license| |semantic-release|

 frontend-app-account
 ====================

-This is a micro-frontend application responsible for the display and updating of a user's account information.  Please tag **@edx/arch-team** on any PRs or issues.
+Please tag **@edx/community-engineering** on any PRs or issues.  Thanks!

-Development
-----------
+Introduction
+------------

-Start Devstack
-^^^^^^^^^^^^^^
+This is a micro-frontend application responsible for the display and updating of a user's account information.

-To use this application `devstack <https://github.com/edx/devstack>`__ must be running and you must be logged into it.
+What is the domain of this MFE?

-  Start devstack
-  Log in (http://localhost:18000/login)
+In this MFE: Private user settings UIs. Public facing profile is in a `separate MFE (Profile) <https://github.com/edx/frontend-app-profile>`_

-Start the development server
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+- Account settings page

-In this project, install requirements and start the development server by running:
+- Demographics collection

-.. code:: bash
+- IDV (Identity Verification)

-   npm install
-   npm start # The server will run on port 1997
+Installation
+------------

-Once the dev server is up visit http://localhost:1997.
+This MFE is bundled with `Devstack <https://github.com/edx/devstack>`_, see the `Getting Started <https://github.com/edx/devstack#getting-started>`_ section for setup instructions.

-Configuration and Deployment
----------------------------
+1. Install Devstack using the `Getting Started <https://github.com/edx/devstack#getting-started>`_ instructions.

-This MFE is configured via node environment variables supplied at build time. See the .env file for the list of required environment variables. Example build syntax with a single environment variable:
+2. Start up Devstack, if it's not already started.
+
+3. Log in to Devstack (http://localhost:18000/login )
+
+4. Within this project, install requirements and start the development server:
+
+   .. code-block::
+
+      npm install
+      npm start # The server will run on port 1997
+
+5. Once the dev server is up, visit http://localhost:1997 to access the MFE
+
+   .. image:: ./docs/images/localhost_preview.png
+
+Environment Variables/Setup Notes
+---------------------------------
+
+This MFE is configured via environment variables supplied at build time.  All micro-frontends have a shared set of required environment variables, as documented in the Open edX Developer Guide under `Required Environment Variables <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html#required-environment-variables>`__.
+
+The account settings micro-frontend also supports the following additional variable:
+
+``SUPPORT_URL``
+
+Example: ``https://support.example.com``
+
+The fully-qualified URL to the support page in the target environment.
+
+edX-specific Environment Variables
+**********************************
+
+Furthermore, there are several edX-specific environment variables that enable integrations with closed-source services private to the edX organization, and are unsupported in Open edX.  Enabling these environment variables will result in undefined behavior in Open edX installations:
+
+``COACHING_ENABLED``
+
+Example: ``true`` | ``''`` (empty strings are falsy)
+
+Enables support for a section of the micro-frontend that helps users arrange for coaching sessions.  Integrates with a private coaching plugin and is only used by edx.org.
+
+``ENABLE_DEMOGRAPHICS_COLLECTION``
+
+Example: ``true`` | ``''`` (empty strings are falsy)
+
+Enables support for a section of the account settings page where a user can enter demographics information.  Integrates with a private demographics service and is only used by edx.org.
+
+``DEMOGRAPHICS_BASE_URL``
+
+Example: ``https://demographics.example.com``
+
+Required only if ``ENABLE_DEMOGRAPHICS_COLLECTION`` is true.  The fully-qualified URL to the private demographics service in the target environment.
+
+Example build syntax with a single environment variable:

 .. code:: bash

   NODE_ENV=development ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload' npm run build

-
 For more information see the document: `Micro-frontend applications in Open
-edX <https://github.com/edx/edx-developer-docs/blob/5191e800bf16cf42f25c58c58f983bdaf7f9305d/docs/micro-frontends-in-open-edx.rst>`__.
+edX <https://edx.readthedocs.io/projects/edx-developer-docs/en/latest/developers_guide/micro_frontends_in_open_edx.html#required-environment-variables>`__.

-.. |Build Status| image:: https://api.travis-ci.com/edx/frontend-app-account.svg?branch=master
-   :target: https://travis-ci.com/edx/frontend-app-account
+Known Issues
+------------
+
+None
+
+Development Roadmap
+-------------------
+
+We don't have anything planned for the core of the MFE (the account settings page) - this MFE is currently in maintenance mode.
+There may be a replacement for IDV coming down the pipe, so that may be DEPRed.
+In the future, it's possible that demographics could be modeled as a plugin rather than being hard-coded into this MFE.
+
+
+==============================
+
+.. |ci-badge| image:: https://github.com/edx/edx-developer-docs/actions/workflows/ci.yml/badge.svg
+   :target: https://github.com/edx/edx-developer-docs/actions/workflows/ci.yml
+   :alt: Continuous Integration
 .. |Codecov| image:: https://img.shields.io/codecov/c/github/edx/frontend-app-account
   :target: https://codecov.io/gh/edx/frontend-app-account
 .. |npm_version| image:: https://img.shields.io/npm/v/@edx/frontend-app-account.svg
--- a/docs/images/localhost_preview.png
+++ b/docs/images/localhost_preview.png
--- a/openedx.yaml
+++ b/openedx.yaml
@@ -3,5 +3,4 @@

 nick: acct
 oeps: {}
-owner: edx/arch-team
 openedx-release: {ref: master}
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -30,26 +30,26 @@
  ],
  "dependencies": {
    "@edx/brand": "npm:@edx/brand-openedx@1.1.0",
-    "@edx/frontend-component-footer": "10.1.4",
-    "@edx/frontend-component-header": "2.2.4",
-    "@edx/frontend-platform": "1.8.4",
-    "@edx/paragon": "13.1.2",
-    "@fortawesome/fontawesome-svg-core": "1.2.34",
-    "@fortawesome/free-brands-svg-icons": "5.8.2",
-    "@fortawesome/free-regular-svg-icons": "5.7.2",
-    "@fortawesome/free-solid-svg-icons": "5.8.2",
-    "@fortawesome/react-fontawesome": "0.1.14",
+    "@edx/frontend-component-footer": "10.1.6",
+    "@edx/frontend-component-header": "2.3.0",
+    "@edx/frontend-platform": "1.12.6",
+    "@edx/paragon": "16.1.0",
+    "@fortawesome/fontawesome-svg-core": "1.2.36",
+    "@fortawesome/free-brands-svg-icons": "5.15.4",
+    "@fortawesome/free-regular-svg-icons": "5.15.4",
+    "@fortawesome/free-solid-svg-icons": "5.15.4",
+    "@fortawesome/react-fontawesome": "0.1.15",
    "@tensorflow-models/blazeface": "0.0.7",
-    "@tensorflow/tfjs-converter": "1.6.1",
-    "@tensorflow/tfjs-core": "1.6.1",
+    "@tensorflow/tfjs-converter": "1.7.4",
+    "@tensorflow/tfjs-core": "1.7.4",
    "babel-polyfill": "6.26.0",
-    "bowser": "2.10.0",
-    "classnames": "2.2.6",
+    "bowser": "2.11.0",
+    "classnames": "2.3.1",
    "font-awesome": "4.7.0",
    "form-urlencoded": "4.0.1",
-    "formdata-polyfill": "3.0.20",
+    "formdata-polyfill": "4.0.7",
    "history": "4.10.1",
-    "jslib-html5-camera-photo": "3.1.6",
+    "jslib-html5-camera-photo": "3.1.8",
    "lodash.debounce": "4.0.8",
    "lodash.findindex": "4.6.0",
    "lodash.get": "4.4.2",
@@ -58,20 +58,20 @@
    "lodash.omit": "4.5.0",
    "lodash.pick": "4.4.0",
    "lodash.pickby": "4.6.0",
-    "memoize-one": "5.1.1",
+    "memoize-one": "5.2.1",
    "newrelic": "5.13.1",
    "prop-types": "15.7.2",
-    "qs": "6.9.6",
-    "react": "16.10.2",
-    "react-dom": "16.10.2",
-    "react-redux": "7.1.3",
-    "react-router": "5.1.2",
-    "react-router-dom": "5.1.2",
+    "qs": "6.10.1",
+    "react": "16.14.0",
+    "react-dom": "16.14.0",
+    "react-redux": "7.2.5",
+    "react-router": "5.2.1",
+    "react-router-dom": "5.3.0",
    "react-router-hash-link": "1.2.2",
    "react-scrollspy": "3.4.3",
-    "react-transition-group": "4.3.0",
-    "redux": "4.0.5",
-    "redux-devtools-extension": "2.13.8",
+    "react-transition-group": "4.4.2",
+    "redux": "4.1.1",
+    "redux-devtools-extension": "2.13.9",
    "redux-logger": "3.0.6",
    "redux-saga": "1.1.3",
    "redux-thunk": "2.3.0",
@@ -79,15 +79,15 @@
    "universal-cookie": "4.0.4"
  },
  "devDependencies": {
-    "@edx/frontend-build": "5.6.9",
-    "@testing-library/jest-dom": "5.11.9",
-    "@testing-library/react": "10.4.9",
-    "codecov": "3.7.2",
-    "enzyme": "3.10.0",
+    "@edx/frontend-build": "8.0.4",
+    "@testing-library/jest-dom": "5.14.1",
+    "@testing-library/react": "12.0.0",
+    "codecov": "3.8.3",
+    "enzyme": "3.11.0",
    "enzyme-adapter-react-16": "1.15.6",
-    "es-check": "5.0.0",
-    "husky": "3.0.9",
-    "react-test-renderer": "16.8.6",
+    "es-check": "6.0.0",
+    "husky": "7.0.2",
+    "react-test-renderer": "16.14.0",
    "reactifex": "1.1.1",
    "redux-mock-store": "1.5.4"
  }
--- a/public/index.html
+++ b/public/index.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html lang="en-us">
  <head>
-      <title>Account | edX</title>
+      <title>Account | <%= process.env.SITE_NAME %></title>
      <meta charset="utf-8">
      <meta name="viewport" content="width=device-width, initial-scale=1.0">
      <link rel="shortcut icon" href="<%=webpackConfig.output.publicPath%>favicon.ico" type="image/x-icon" />
--- a/renovate.json
+++ b/renovate.json
@@ -1,17 +1,28 @@
 {
  "extends": [
-    "config:base"
+    "config:base",
+    "schedule:weekly",
+    ":automergeLinters",
+    ":automergeMinor",
+    ":automergeTesters",
+    ":enableVulnerabilityAlerts",
+    ":rebaseStalePrs",
+    ":semanticCommits",
+    ":updateNotScheduled"
  ],
-  "patch": {
-    "automerge": true
-  },
-  "rebaseStalePrs": true,
  "packageRules": [
    {
-      "matchPackagePatterns": ["^@edx/paragon"],
-      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
-      "automerge": true,
-      "stabilityDays": 3
+      "matchDepTypes": [
+        "devDependencies"
+      ],
+      "matchUpdateTypes": [
+        "lockFileMaintenance",
+        "minor",
+        "patch",
+        "pin"
+      ],
+      "automerge": true
    }
-  ]
+  ],
+  "timezone": "America/New_York"
 }
--- a/src/account-settings/AccountSettingsPage.jsx
+++ b/src/account-settings/AccountSettingsPage.jsx
@@ -13,13 +13,15 @@ import {
  getCountryList,
  getLanguageList,
 } from '@edx/frontend-platform/i18n';
-import { Hyperlink } from '@edx/paragon';
+import {
+  Button, Hyperlink, Icon, Alert,
+} from '@edx/paragon';
+import { CheckCircle, Error, WarningFilled } from '@edx/paragon/icons';

 import messages from './AccountSettingsPage.messages';
 import { fetchSettings, saveSettings, updateDraft } from './data/actions';
 import { accountSettingsPageSelector } from './data/selectors';
 import PageLoading from './PageLoading';
-import Alert from './Alert';
 import JumpNav from './JumpNav';
 import DeleteAccount from './delete-account';
 import EditableField from './EditableField';
@@ -27,6 +29,7 @@ import ResetPassword from './reset-password';
 import ThirdPartyAuth from './third-party-auth';
 import BetaLanguageBanner from './BetaLanguageBanner';
 import EmailField from './EmailField';
+import OneTimeDismissibleAlert from './OneTimeDismissibleAlert';
 import {
  YEAR_OF_BIRTH_OPTIONS,
  EDUCATION_LEVELS,
@@ -44,8 +47,8 @@ class AccountSettingsPage extends React.Component {

    // If there is a "duplicate_provider" query parameter, that's the backend's
    // way of telling us that the provider account the user tried to link is already linked
-    // to another Open edX account. We use this to display a message to that effect, and remove the
-    // parameter from the URL.
+    // to another user account on the platform. We use this to display a message to that effect,
+    // and remove the parameter from the URL.
    const duplicateTpaProvider = getQueryParameters().duplicate_provider;
    if (duplicateTpaProvider !== undefined) {
      history.replace(history.location.pathname);
@@ -136,13 +139,28 @@ class AccountSettingsPage extends React.Component {
    })),
  }));

+  sortDates = (a, b) => {
+    const aTimeSinceEpoch = new Date(a).getTime();
+    const bTimeSinceEpoch = new Date(b).getTime();
+
+    return bTimeSinceEpoch - aTimeSinceEpoch;
+  }
+
+  sortVerifiedNameRecords = verifiedNameHistory => {
+    if (Array.isArray(verifiedNameHistory)) {
+      return [...verifiedNameHistory].sort(this.sortDates);
+    }
+
+    return [];
+  }
+
  handleEditableFieldChange = (name, value) => {
    this.props.updateDraft(name, value);
-  };
+  }

  handleSubmit = (formId, values) => {
    this.props.saveSettings(formId, values);
-  };
+  }

  isEditable(fieldName) {
    return !this.props.staticFields.includes(fieldName);
@@ -161,13 +179,14 @@ class AccountSettingsPage extends React.Component {

    return (
      <div>
-        <Alert className="alert alert-danger" role="alert">
+        <Alert variant="danger">
          <FormattedMessage
            id="account.settings.message.duplicate.tpa.provider"
-            defaultMessage="The {provider} account you selected is already linked to another edX account."
-            description="alert message informing the user that the third-party account they attempted to link is already linked to another edX account"
+            defaultMessage="The {provider} account you selected is already linked to another {siteName} account."
+            description="alert message informing the user that the third-party account they attempted to link is already linked to another account"
            values={{
              provider: <b>{this.state.duplicateTpaProvider}</b>,
+              siteName: getConfig().SITE_NAME,
            }}
          />
        </Alert>
@@ -182,7 +201,7 @@ class AccountSettingsPage extends React.Component {

    return (
      <div>
-        <Alert className="alert alert-primary" role="alert">
+        <Alert variant="info">
          <FormattedMessage
            id="account.settings.message.managed.settings"
            defaultMessage="Your profile settings are managed by {managerTitle}. Contact your administrator or {support} for help."
@@ -205,6 +224,111 @@ class AccountSettingsPage extends React.Component {
    );
  }

+  renderVerifiedNameSuccessMessage = () => (
+    <OneTimeDismissibleAlert
+      id="dismissedVerifiedNameSuccessMessage"
+      variant="success"
+      icon={CheckCircle}
+      header={this.props.intl.formatMessage(messages['account.settings.field.name.verified.success.message.header'])}
+      body={this.props.intl.formatMessage(messages['account.settings.field.name.verified.success.message'])}
+    />
+  )
+
+  renderVerifiedNameFailureMessage = (verifiedName, created) => {
+    const dateValue = new Date(created).valueOf();
+    const id = `dismissedVerifiedNameFailureMessage-${verifiedName}-${dateValue}`;
+
+    return (
+      <OneTimeDismissibleAlert
+        id={id}
+        variant="danger"
+        icon={Error}
+        header={this.props.intl.formatMessage(messages['account.settings.field.name.verified.failure.message.header'])}
+        body={
+          (
+            <>
+              <div className="d-flex flex-row">
+                {this.props.intl.formatMessage(
+                  messages['account.settings.field.name.verified.failure.message'], {
+                    verifiedName,
+                  },
+                )}
+              </div>
+              <div className="d-flex flex-row-reverse mt-3">
+                <Button
+                  variant="primary"
+                  href="https://support.edx.org/hc/en-us/articles/360004381594-Why-was-my-ID-verification-denied"
+                >
+                  {this.props.intl.formatMessage(messages['account.settings.field.name.verified.failure.message.help.link'])}
+                </Button>{' '}
+              </div>
+            </>
+          )
+        }
+      />
+    );
+  }
+
+  renderVerifiedNameSubmittedMessage = () => (
+    <Alert
+      variant="warning"
+      icon={WarningFilled}
+    >
+      <Alert.Heading>
+        {this.props.intl.formatMessage(messages['account.settings.field.name.verified.submitted.message.header'])}
+      </Alert.Heading>
+      <p>
+        {this.props.intl.formatMessage(messages['account.settings.field.name.verified.submitted.message'])}
+      </p>
+    </Alert>
+  )
+
+  renderVerifiedNameMessage = verifiedNameRecord => {
+    const { created, status, verified_name: verifiedName } = verifiedNameRecord;
+
+    switch (status) {
+      case 'approved':
+        return this.renderVerifiedNameSuccessMessage();
+      case 'denied':
+        return this.renderVerifiedNameFailureMessage(verifiedName, created);
+      case 'submitted':
+        return this.renderVerifiedNameSubmittedMessage();
+      default:
+        return null;
+    }
+  }
+
+  renderVerifiedNameIcon = (status) => {
+    switch (status) {
+      case 'approved':
+        return (<Icon src={CheckCircle} className="ml-1" style={{ height: '18px', width: '18px', color: 'green' }} />);
+      case 'submitted':
+        return (<Icon src={WarningFilled} className="ml-1" style={{ height: '18px', width: '18px', color: 'yellow' }} />);
+      default:
+        return null;
+    }
+  }
+
+  renderVerifiedNameHelpText = (status) => {
+    switch (status) {
+      case 'approved':
+        return (this.props.intl.formatMessage(messages['account.settings.field.name.verified.help.text.verified']));
+      case 'submitted':
+        return (this.props.intl.formatMessage(messages['account.settings.field.name.verified.help.text.submitted']));
+      default:
+        return null;
+    }
+  }
+
+  renderFullNameHelpText = (status) => {
+    switch (status) {
+      case 'submitted':
+        return (this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text.submitted']));
+      default:
+        return (this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text']));
+    }
+  }
+
  renderEmptyStaticFieldMessage() {
    if (this.isManagedProfile()) {
      return this.props.intl.formatMessage(messages['account.settings.static.field.empty'], {
@@ -260,6 +384,9 @@ class AccountSettingsPage extends React.Component {
    // Show State field only if the country is US (could include Canada later)
    const showState = this.props.formValues.country === COUNTRY_WITH_STATES;

+    const { verifiedName } = this.props.formValues;
+    const verifiedNameEnabled = this.props.formValues.verifiedNameHistory.verified_name_enabled;
+
    const timeZoneOptions = this.getLocalizedTimeZoneOptions(
      this.props.timeZoneOptions,
      this.props.countryTimeZoneOptions,
@@ -267,10 +394,11 @@ class AccountSettingsPage extends React.Component {
    );

    const hasLinkedTPA = findIndex(this.props.tpaProviders, provider => provider.connected) >= 0;
-
    return (
      <>
        <div className="account-section" id="basic-information" ref={this.navLinkRefs['#basic-information']}>
+          {verifiedNameEnabled && this.renderVerifiedNameMessage(this.props.formValues.mostRecentVerifiedName)}
+
          <h2 className="section-heading">
            {this.props.intl.formatMessage(messages['account.settings.section.account.information'])}
          </h2>
@@ -282,7 +410,10 @@ class AccountSettingsPage extends React.Component {
            type="text"
            value={this.props.formValues.username}
            label={this.props.intl.formatMessage(messages['account.settings.field.username'])}
-            helpText={this.props.intl.formatMessage(messages['account.settings.field.username.help.text'])}
+            helpText={this.props.intl.formatMessage(
+              messages['account.settings.field.username.help.text'],
+              { siteName: getConfig().SITE_NAME },
+            )}
            isEditable={false}
            {...editableFieldProps}
          />
@@ -296,10 +427,44 @@ class AccountSettingsPage extends React.Component {
                ? this.props.intl.formatMessage(messages['account.settings.field.full.name.empty'])
                : this.renderEmptyStaticFieldMessage()
            }
-            helpText={this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text'])}
-            isEditable={this.isEditable('name')}
+            helpText={
+              verifiedNameEnabled && verifiedName
+                ? this.renderFullNameHelpText(verifiedName.status)
+                : this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text'])
+            }
+            isEditable={
+              verifiedNameEnabled && verifiedName
+                ? this.isEditable('verifiedName') && this.isEditable('name')
+                : this.isEditable('name')
+            }
+            isGrayedOut={
+              verifiedNameEnabled && verifiedName && !this.isEditable('verifiedName')
+            }
            {...editableFieldProps}
          />
+          {verifiedNameEnabled && verifiedName
+            && (
+            <EditableField
+              name="verifiedName"
+              type="text"
+              value={this.props.formValues.verifiedName.verified_name}
+              label={
+                (
+                  <div className="d-flex">
+                    {this.props.intl.formatMessage(messages['account.settings.field.name.verified'])}
+                    {
+                      this.renderVerifiedNameIcon(verifiedName.status)
+                    }
+                  </div>
+                )
+              }
+              helpText={this.renderVerifiedNameHelpText(verifiedName.status)}
+              isEditable={this.isEditable('verifiedName')}
+              isGrayedOut={!this.isEditable('verifiedName')}
+              {...(this.isEditable('verifiedName') && editableFieldProps)}
+            />
+            )}
+
          <EmailField
            name="email"
            label={this.props.intl.formatMessage(messages['account.settings.field.email'])}
@@ -310,7 +475,10 @@ class AccountSettingsPage extends React.Component {
            }
            value={this.props.formValues.email}
            confirmationMessageDefinition={messages['account.settings.field.email.confirmation']}
-            helpText={this.props.intl.formatMessage(messages['account.settings.field.email.help.text'])}
+            helpText={this.props.intl.formatMessage(
+              messages['account.settings.field.email.help.text'],
+              { siteName: getConfig().SITE_NAME },
+            )}
            isEditable={this.isEditable('email')}
            {...editableFieldProps}
          />
@@ -405,7 +573,12 @@ class AccountSettingsPage extends React.Component {
          <h2 className="section-heading">
            {this.props.intl.formatMessage(messages['account.settings.section.social.media'])}
          </h2>
-          <p>{this.props.intl.formatMessage(messages['account.settings.section.social.media.description'])}</p>
+          <p>
+            {this.props.intl.formatMessage(
+              messages['account.settings.section.social.media.description'],
+              { siteName: getConfig().SITE_NAME },
+            )}
+          </p>

          <EditableField
            name="social_link_linkedin"
@@ -466,7 +639,12 @@ class AccountSettingsPage extends React.Component {

        <div className="account-section" id="linked-accounts" ref={this.navLinkRefs['#linked-accounts']}>
          <h2 className="section-heading">{this.props.intl.formatMessage(messages['account.settings.section.linked.accounts'])}</h2>
-          <p>{this.props.intl.formatMessage(messages['account.settings.section.linked.accounts.description'])}</p>
+          <p>
+            {this.props.intl.formatMessage(
+              messages['account.settings.section.linked.accounts.description'],
+              { siteName: getConfig().SITE_NAME },
+            )}
+          </p>
          <ThirdPartyAuth />
        </div>

@@ -561,6 +739,24 @@ AccountSettingsPage.propTypes = {
    }),
    state: PropTypes.string,
    shouldDisplayDemographicsSection: PropTypes.bool,
+    verifiedNameHistory: PropTypes.shape({
+      verified_name_enabled: PropTypes.bool,
+      use_verified_name_for_certs: PropTypes.bool,
+      results: PropTypes.arrayOf(
+        PropTypes.shape({
+          verified_name: PropTypes.string,
+          status: PropTypes.string,
+        }),
+      ),
+    }),
+    verifiedName: PropTypes.shape({
+      verified_name: PropTypes.string,
+      status: PropTypes.string,
+    }),
+    mostRecentVerifiedName: PropTypes.shape({
+      verified_name: PropTypes.string,
+      status: PropTypes.string,
+    }),
  }).isRequired,
  siteLanguage: PropTypes.shape({
    previousValue: PropTypes.string,
--- a/src/account-settings/AccountSettingsPage.messages.jsx
+++ b/src/account-settings/AccountSettingsPage.messages.jsx
@@ -63,7 +63,7 @@ const messages = defineMessages({
  },
  'account.settings.section.linked.accounts.description': {
    id: 'account.settings.section.linked.accounts.description',
-    defaultMessage: 'You can link your identity accounts to simplify signing in to edX.',
+    defaultMessage: 'You can link your identity accounts to simplify signing in to {siteName}.',
    description: 'The linked accounts section heading description.',
  },
  'account.settings.field.username': {
@@ -73,7 +73,7 @@ const messages = defineMessages({
  },
  'account.settings.field.username.help.text': {
    id: 'account.settings.field.username.help.text',
-    defaultMessage: 'The name that identifies you on edX. You cannot change your username.',
+    defaultMessage: 'The name that identifies you on {siteName}. You cannot change your username.',
    description: 'Help text for the account settings username field.',
  },
  'account.settings.field.full.name': {
@@ -91,6 +91,61 @@ const messages = defineMessages({
    defaultMessage: 'The name that is used for ID verification and that appears on your certificates.',
    description: 'Help text for the account settings name field.',
  },
+  'account.settings.field.name.verified': {
+    id: 'account.settings.field.name.verified',
+    defaultMessage: 'Verified name',
+    description: 'Label for account settings verified name field.',
+  },
+  'account.settings.field.name.verified.help.text.verified': {
+    id: 'account.settings.field.name.verified.help.text.verified',
+    defaultMessage: 'This name has been verified by government ID.',
+    description: 'Help text for the account settings verified name field when the name is verified.',
+  },
+  'account.settings.field.name.verified.help.text.submitted': {
+    id: 'account.settings.field.name.verified.help.text.submitted',
+    defaultMessage: 'Verification has been submitted. This usually takes 48 hours or less. Verified name cannot be changed at this time.',
+    description: 'Help text for the account settings verified name field when a verified name has been submitted.',
+  },
+  'account.settings.field.full.name.help.text.submitted': {
+    id: 'account.settings.field.full.name.help.text.submitted',
+    defaultMessage: 'When identity verification is successful, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.',
+    description: 'Help text for the account settings full name field when a verified name has been submitted.',
+  },
+  'account.settings.field.name.verified.success.message': {
+    id: 'account.settings.field.name.verified.success.message',
+    defaultMessage: 'Your identity verification request has successfully completed. You now have the option of selecting which name you prefer to appear on your certificates and public-records.',
+    description: 'The body of the success alert indicating that a user\'s name has been verified',
+  },
+  'account.settings.field.name.verified.success.message.header': {
+    id: 'account.settings.field.name.verified.success.message.header',
+    defaultMessage: 'Your name change request is complete!',
+    description: 'The header of the success alert indicating that a user\'s name has been verified',
+  },
+  'account.settings.field.name.verified.failure.message': {
+    id: 'account.settings.field.name.verified.failure.message',
+    defaultMessage: 'Your Verified name change attempt, “{verifiedName}”, did not pass ID verification. Your previous Verified name settings have been restored.',
+    description: 'The body of the failure alert indicating that a user\'s name was not able to be verified',
+  },
+  'account.settings.field.name.verified.failure.message.header': {
+    id: 'account.settings.field.name.verified.failure.message.header',
+    defaultMessage: 'We were not able to verify your identity.',
+    description: 'The header of the failure alert indicating that a user\'s name was not able to be verified',
+  },
+  'account.settings.field.name.verified.failure.message.help.link': {
+    id: 'account.settings.field.name.verified.failure.message.help.link',
+    defaultMessage: 'Learn more about ID verification',
+    description: 'The text of the button displayed when a user\'s name was not able to be verified, intended to direct the user to a help article about ID verification.',
+  },
+  'account.settings.field.name.verified.submitted.message': {
+    id: 'account.settings.field.name.verified.submitted.message',
+    defaultMessage: 'Your identity verification request has been submitted and usually takes between 24 and 48 hours to complete. When your request is approved, your updated name will appear on all associated certificates and public-facing records.',
+    description: 'The body of the submitted alert indicating that a user\'s name has been submitted for verification',
+  },
+  'account.settings.field.name.verified.submitted.message.header': {
+    id: 'account.settings.field.name.verified.submitted.message.header',
+    defaultMessage: 'Your name change request is almost complete!',
+    description: 'The header of the submitted alert indicating that a user\'s name has been submitted for verification',
+  },
  'account.settings.field.email': {
    id: 'account.settings.field.email',
    defaultMessage: 'Email address (Sign in)',
@@ -108,7 +163,7 @@ const messages = defineMessages({
  },
  'account.settings.field.email.help.text': {
    id: 'account.settings.field.email.help.text',
-    defaultMessage: 'You receive messages from edX and course teams at this address.',
+    defaultMessage: 'You receive messages from {siteName} and course teams at this address.',
    description: 'Help text for the account settings email field.',
  },
  'account.settings.field.secondary.email': {
@@ -331,7 +386,7 @@ const messages = defineMessages({
  },
  'account.settings.section.social.media.description': {
    id: 'account.settings.section.social.media.description',
-    defaultMessage: 'Optionally, link your personal accounts to the social media icons on your edX profile.',
+    defaultMessage: 'Optionally, link your personal accounts to the social media icons on your {siteName} profile.',
    description: 'Section subheader for social media links settings',
  },
  'account.settings.field.social.platform.name.linkedin': {
--- a/src/account-settings/EditableField.jsx
+++ b/src/account-settings/EditableField.jsx
@@ -37,6 +37,7 @@ function EditableField(props) {
    onChange,
    isEditing,
    isEditable,
+    isGrayedOut,
    intl,
    ...others
  } = props;
@@ -161,7 +162,7 @@ function EditableField(props) {
                </Button>
              ) : null}
            </div>
-            <p data-hj-suppress>{renderValue(value)}</p>
+            <p data-hj-suppress className={isGrayedOut ? 'grayed-out' : null}>{renderValue(value)}</p>
            <p className="small text-muted mt-n2">{renderConfirmationMessage() || helpText}</p>
          </div>
        ),
@@ -172,7 +173,7 @@ function EditableField(props) {

 EditableField.propTypes = {
  name: PropTypes.string.isRequired,
-  label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  label: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.node]),
  emptyLabel: PropTypes.node,
  type: PropTypes.string.isRequired,
  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
@@ -196,6 +197,7 @@ EditableField.propTypes = {
  onChange: PropTypes.func.isRequired,
  isEditing: PropTypes.bool,
  isEditable: PropTypes.bool,
+  isGrayedOut: PropTypes.bool,
  intl: intlShape.isRequired,
 };

@@ -211,6 +213,7 @@ EditableField.defaultProps = {
  helpText: undefined,
  isEditing: false,
  isEditable: true,
+  isGrayedOut: false,
  userSuppliedValue: undefined,
 };

--- a/src/account-settings/OneTimeDismissibleAlert.jsx
+++ b/src/account-settings/OneTimeDismissibleAlert.jsx
@@ -0,0 +1,43 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+
+import { Alert } from '@edx/paragon';
+
+export default function OneTimeDismissibleAlert(props) {
+  const [dismissed, setDismissed] = useState(localStorage.getItem(props.id) !== 'true');
+
+  const onClose = () => {
+    localStorage.setItem(props.id, 'true');
+    setDismissed(false);
+  };
+
+  return (
+    <Alert
+      variant={props.variant}
+      dismissible
+      icon={props.icon}
+      onClose={onClose}
+      show={dismissed}
+    >
+      <Alert.Heading>{props.header}</Alert.Heading>
+      <p>
+        {props.body}
+      </p>
+    </Alert>
+  );
+}
+
+OneTimeDismissibleAlert.propTypes = {
+  id: PropTypes.string.isRequired,
+  variant: PropTypes.string,
+  icon: PropTypes.func,
+  header: PropTypes.string,
+  body: PropTypes.string,
+};
+
+OneTimeDismissibleAlert.defaultProps = {
+  variant: 'success',
+  icon: undefined,
+  header: undefined,
+  body: undefined,
+};
--- a/src/account-settings/_style.scss
+++ b/src/account-settings/_style.scss
@@ -50,4 +50,8 @@
      line-height: 1.6rem;
    }
  }
+  .grayed-out{
+    opacity: 0.6; /* Real browsers */
+    filter: alpha(opacity = 60); /* MSIE */
+  }
 }
--- a/src/account-settings/data/sagas.js
+++ b/src/account-settings/data/sagas.js
@@ -38,7 +38,11 @@ import {
 import { saga as thirdPartyAuthSaga } from '../third-party-auth';

 // Services
-import { getSettings, patchSettings, getTimeZones } from './service';
+import {
+  getSettings,
+  patchSettings,
+  getTimeZones,
+} from './service';

 export function* handleFetchSettings() {
  try {
--- a/src/account-settings/data/selectors.js
+++ b/src/account-settings/data/selectors.js
@@ -7,9 +7,63 @@ export const accountSettingsSelector = state => ({ ...state[storeName] });

 const editableFieldNameSelector = (state, props) => props.name;

+const sortedVerifiedNameHistorySelector = createSelector(
+  accountSettingsSelector,
+  accountSettings => {
+    function sortDates(a, b) {
+      const aTimeSinceEpoch = new Date(a).getTime();
+      const bTimeSinceEpoch = new Date(b).getTime();
+      return bTimeSinceEpoch - aTimeSinceEpoch;
+    }
+
+    const history = accountSettings.values.verifiedNameHistory && accountSettings.values.verifiedNameHistory.results;
+
+    if (Array.isArray(history)) {
+      return history.sort(sortDates);
+    }
+
+    return [];
+  },
+);
+
+const mostRecentVerifiedNameSelector = createSelector(
+  sortedVerifiedNameHistorySelector,
+  sortedHistory => (sortedHistory.length > 0 ? sortedHistory[0] : null),
+);
+
+const mostRecentApprovedVerifiedNameValueSelector = createSelector(
+  sortedVerifiedNameHistorySelector,
+  mostRecentVerifiedNameSelector,
+  (sortedHistory, mostRecentVerifiedName) => {
+    const approvedVerifiedNames = sortedHistory.filter(name => name.status === 'approved');
+    const approvedVerifiedName = approvedVerifiedNames.length > 0 ? approvedVerifiedNames[0] : null;
+
+    let verifiedName = null;
+    switch (mostRecentVerifiedName && mostRecentVerifiedName.status) {
+      case 'approved':
+      case 'denied':
+        verifiedName = approvedVerifiedName;
+        break;
+      case 'submitted':
+        verifiedName = mostRecentVerifiedName;
+        break;
+      default:
+        verifiedName = null;
+    }
+    return verifiedName;
+  },
+);
+
 const valuesSelector = createSelector(
  accountSettingsSelector,
-  accountSettings => accountSettings.values,
+  mostRecentVerifiedNameSelector,
+  mostRecentApprovedVerifiedNameValueSelector,
+  (accountSettings, mostRecentVerifiedNameValue, mostRecentApprovedVerifiedNameValue) => (
+    {
+      ...accountSettings.values,
+      verifiedName: mostRecentApprovedVerifiedNameValue,
+      mostRecentVerifiedName: mostRecentVerifiedNameValue,
+    }),
 );

 const draftsSelector = createSelector(
@@ -69,7 +123,18 @@ export const profileDataManagerSelector = createSelector(

 export const staticFieldsSelector = createSelector(
  accountSettingsSelector,
-  accountSettings => (accountSettings.profileDataManager ? ['name', 'email', 'country'] : []),
+  mostRecentVerifiedNameSelector,
+  (accountSettings, verifiedName) => {
+    const staticFields = [];
+    if (accountSettings.profileDataManager) {
+      staticFields.push('name', 'email', 'country');
+    }
+    if (verifiedName && ['pending', 'submitted'].includes(verifiedName.status)) {
+      staticFields.push('verifiedName');
+    }
+
+    return staticFields;
+  },
 );

 /**
--- a/src/account-settings/data/service.js
+++ b/src/account-settings/data/service.js
@@ -176,12 +176,49 @@ export async function shouldDisplayDemographicsQuestions() {
  return false;
 }

+export async function getVerifiedName() {
+  let data;
+  const client = getAuthenticatedHttpClient();
+  try {
+    const requestUrl = `${getConfig().LMS_BASE_URL}/api/edx_name_affirmation/v1/verified_name`;
+    ({ data } = await client.get(requestUrl));
+  } catch (error) {
+    return {};
+  }
+
+  return data;
+}
+
+export async function getVerifiedNameHistory() {
+  let data;
+  const client = getAuthenticatedHttpClient();
+  try {
+    const requestUrl = `${getConfig().LMS_BASE_URL}/api/edx_name_affirmation/v1/verified_name/history`;
+    ({ data } = await client.get(requestUrl));
+  } catch (error) {
+    return {};
+  }
+
+  return data;
+}
+
 /**
 * A single function to GET everything considered a setting.
 * Currently encapsulates Account, Preferences, Coaching, ThirdPartyAuth, and Demographics
 */
 export async function getSettings(username, userRoles, userId) {
-  const results = await Promise.all([
+  const [
+    account,
+    preferences,
+    thirdPartyAuthProviders,
+    profileDataManager,
+    timeZones,
+    coaching,
+    shouldDisplayDemographicsQuestionsResponse,
+    demographics,
+    demographicsOptions,
+    verifiedNameHistory,
+  ] = await Promise.all([
    getAccount(username),
    getPreferences(username),
    getThirdPartyAuthProviders(),
@@ -191,18 +228,20 @@ export async function getSettings(username, userRoles, userId) {
    getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && shouldDisplayDemographicsQuestions(),
    getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && getDemographics(userId),
    getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && getDemographicsOptions(),
+    getVerifiedNameHistory(),
  ]);

  return {
-    ...results[0],
-    ...results[1],
-    thirdPartyAuthProviders: results[2],
-    profileDataManager: results[3],
-    timeZones: results[4],
-    coaching: results[5],
-    shouldDisplayDemographicsSection: results[6],
-    ...results[7], // demographics
-    demographicsOptions: results[8],
+    ...account,
+    ...preferences,
+    thirdPartyAuthProviders,
+    profileDataManager,
+    timeZones,
+    coaching,
+    shouldDisplayDemographicsSection: shouldDisplayDemographicsQuestionsResponse,
+    ...demographics,
+    demographicsOptions,
+    verifiedNameHistory,
  };
 }

--- a/src/account-settings/delete-account/BeforeProceedingBanner.jsx
+++ b/src/account-settings/delete-account/BeforeProceedingBanner.jsx
@@ -6,6 +6,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Hyperlink } from '@edx/paragon';

 // Messages
+import { getConfig } from '@edx/frontend-platform';
 import messages from './messages';

 // Components
@@ -20,15 +21,11 @@ const BeforeProceedingBanner = (props) => {
      icon={<FontAwesomeIcon className="mr-2" icon={faExclamationTriangle} />}
    >
      <FormattedMessage
-        id="account.settings.delete.account.before.proceeding"
-        defaultMessage="Before proceeding, please {actionLink}."
-        description="Error that appears if you are trying to delete your edX account, but something about your account needs attention first.  The actionLink will be instructions, such as 'unlink your Facebook account'."
+        defaultMessage=intl.formatMessage(
+          messages[instructionMessageId], {linkStart: <Hyperlink destination={supportArticleURL}>, linkEnd=</Hyperlink>}
+        )
        values={{
-          actionLink: (
-            <Hyperlink destination={supportArticleUrl}>
-              {intl.formatMessage(messages[instructionMessageId])}
-            </Hyperlink>
-          ),
+          siteName: getConfig().SITE_NAME,
        }}
      />
    </Alert>
--- a/src/account-settings/delete-account/ConfirmationModal.jsx
+++ b/src/account-settings/delete-account/ConfirmationModal.jsx
@@ -8,6 +8,7 @@ import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { faExclamationCircle, faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';

+import { getConfig } from '@edx/frontend-platform';
 import messages from './messages';
 import Alert from '../Alert';
 import PrintingInstructions from './PrintingInstructions';
@@ -65,6 +66,13 @@ export class ConfirmationModal extends Component {
    const open = ['confirming', 'pending', 'failed'].includes(status);
    const passwordFieldId = 'passwordFieldId';
    const invalidMessage = messages[this.getShortErrorMessageId(errorType)];
+
+    // TODO: We lack a good way of providing custom language for a particular site.  This is a hack
+    // to allow edx.org to fulfill its business requirements.
+    const deleteAccountModalText2MessageKey = getConfig().SITE_NAME === 'edX'
+      ? 'account.settings.delete.account.modal.text.2.edX'
+      : 'account.settings.delete.account.modal.text.2';
+
    return (
      <Modal
        open={open}
@@ -77,9 +85,17 @@ export class ConfirmationModal extends Component {
              icon={<FontAwesomeIcon className="mr-2" icon={faExclamationTriangle} />}
            >
              <h6>
-                {intl.formatMessage(messages['account.settings.delete.account.modal.text.1'])}
+                {intl.formatMessage(
+                  messages['account.settings.delete.account.modal.text.1'],
+                  { siteName: getConfig().SITE_NAME },
+                )}
              </h6>
-              <p>{intl.formatMessage(messages['account.settings.delete.account.modal.text.2'])}</p>
+              <p>
+                {intl.formatMessage(
+                  messages[deleteAccountModalText2MessageKey],
+                  { siteName: getConfig().SITE_NAME },
+                )}
+              </p>
              <p>
                <PrintingInstructions />
              </p>
--- a/src/account-settings/delete-account/DeleteAccount.jsx
+++ b/src/account-settings/delete-account/DeleteAccount.jsx
@@ -60,19 +60,36 @@ export class DeleteAccount extends React.Component {
    } = this.props;
    const canDelete = isVerifiedAccount && !hasLinkedTPA;

+    // TODO: We lack a good way of providing custom language for a particular site.  This is a hack
+    // to allow edx.org to fulfill its business requirements.
+    const deleteAccountText2MessageKey = getConfig().SITE_NAME === 'edX'
+      ? 'account.settings.delete.account.text.2.edX'
+      : 'account.settings.delete.account.text.2';
+
    return (
      <div>
        <h2 className="section-heading">
          {intl.formatMessage(messages['account.settings.delete.account.header'])}
        </h2>
        <p>{intl.formatMessage(messages['account.settings.delete.account.subheader'])}</p>
-        <p>{intl.formatMessage(messages['account.settings.delete.account.text.1'])}</p>
-        <p>{intl.formatMessage(messages['account.settings.delete.account.text.2'])}</p>
+        <p>
+          {intl.formatMessage(
+            messages['account.settings.delete.account.text.1'],
+            { siteName: getConfig().SITE_NAME },
+          )}
+        </p>
+        <p>
+          {intl.formatMessage(
+            messages[deleteAccountText2MessageKey],
+            { siteName: getConfig().SITE_NAME },
+          )}
+        </p>
        <p>
          <PrintingInstructions />
        </p>
        <p className="text-danger h6">
-          {intl.formatMessage(messages['account.settings.delete.account.text.warning'])}
+          {intl.formatMessage(messages['account.settings.delete.account.text.warning'],
+            { siteName: getConfig().SITE_NAME })}
        </p>
        <p>
          <Hyperlink destination="https://support.edx.org/hc/en-us/sections/115004139268-Manage-Your-Account-Settings">
--- a/src/account-settings/delete-account/PrintingInstructions.jsx
+++ b/src/account-settings/delete-account/PrintingInstructions.jsx
@@ -2,22 +2,39 @@ import React from 'react';
 import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Hyperlink } from '@edx/paragon';

+import { getConfig } from '@edx/frontend-platform';
 import messages from './messages';

 const PrintingInstructions = (props) => {
  const actionLink = (
    <Hyperlink
-      destination="https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_certificates.html#printing-a-certificate"
+      // TODO: What would a generic version of this link look like?  Should
+      // CERTIFICATE_SHARING_HELP_URL really be a configuration variable?  In the meantime,
+      // We've removed the link from the default message.
+      destination="https://support.edx.org/hc/en-us/sections/115004173027-Receive-and-Share-edX-Certificates"
    >
      {props.intl.formatMessage(messages['account.settings.delete.account.text.3.link'])}
    </Hyperlink>
  );

+  // TODO: We lack a good way of providing custom language for a particular site.  This is a hack
+  // to allow edx.org to mention MicroMasters certificates to fulfill its business requirements.
+  if (getConfig().SITE_NAME === 'edX') {
+    return (
+      <FormattedMessage
+        id="account.settings.delete.account.text.3.edX"
+        defaultMessage="You may also lose access to verified certificates and other program credentials like MicroMasters certificates. You can make a copy of these for your records before proceeding with deletion. {actionLink}."
+        description="A message in the user account deletion area warning users that deleting their account will prevent them from accessing their certificates. 'actionLink' is a HTML link with a full sentence that describes how to print a certificate."
+        values={{ actionLink }}
+      />
+    );
+  }
+
  return (
    <FormattedMessage
      id="account.settings.delete.account.text.3"
-      defaultMessage="You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, {actionLink}."
-      description="A message in the user account deletion area"
+      defaultMessage="You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion."
+      description="A message in the user account deletion area warning users that deleting their account will prevent them from accessing their certificates."
      values={{ actionLink }}
    />
  );
--- a/src/account-settings/delete-account/snapshots/ConfirmationModal.test.jsx.snap
+++ b/src/account-settings/delete-account/snapshots/ConfirmationModal.test.jsx.snap
@@ -95,22 +95,14 @@ Array [
                </div>
                <div>
                  <h6>
-                    You have selected "Delete My Account". Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.
+                    You have selected "Delete My Account". Deletion of your account and personal data is permanent and cannot be undone. localhost will not be able to recover your account or the data that is deleted.
                  </h6>
                  <p>
-                    If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.
+                    If you proceed, you will be unable to use this account to take courses on localhost.
                  </p>
                  <p>
                    <span>
-                      You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, 
-                      <a
-                        href="https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_certificates.html#printing-a-certificate"
-                        onClick={[Function]}
-                        target="_self"
-                      >
-                        follow the instructions for printing or downloading a certificate
-                      </a>
-                      .
+                      You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
                    </span>
                  </p>
                </div>
@@ -314,22 +306,14 @@ Array [
                </div>
                <div>
                  <h6>
-                    You have selected "Delete My Account". Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.
+                    You have selected "Delete My Account". Deletion of your account and personal data is permanent and cannot be undone. localhost will not be able to recover your account or the data that is deleted.
                  </h6>
                  <p>
-                    If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.
+                    If you proceed, you will be unable to use this account to take courses on localhost.
                  </p>
                  <p>
                    <span>
-                      You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, 
-                      <a
-                        href="https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_certificates.html#printing-a-certificate"
-                        onClick={[Function]}
-                        target="_self"
-                      >
-                        follow the instructions for printing or downloading a certificate
-                      </a>
-                      .
+                      You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
                    </span>
                  </p>
                </div>
@@ -500,22 +484,14 @@ Array [
                </div>
                <div>
                  <h6>
-                    You have selected "Delete My Account". Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.
+                    You have selected "Delete My Account". Deletion of your account and personal data is permanent and cannot be undone. localhost will not be able to recover your account or the data that is deleted.
                  </h6>
                  <p>
-                    If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.
+                    If you proceed, you will be unable to use this account to take courses on localhost.
                  </p>
                  <p>
                    <span>
-                      You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, 
-                      <a
-                        href="https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_certificates.html#printing-a-certificate"
-                        onClick={[Function]}
-                        target="_self"
-                      >
-                        follow the instructions for printing or downloading a certificate
-                      </a>
-                      .
+                      You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
                    </span>
                  </p>
                </div>
--- a/src/account-settings/delete-account/snapshots/DeleteAccount.test.jsx.snap
+++ b/src/account-settings/delete-account/snapshots/DeleteAccount.test.jsx.snap
@@ -11,31 +11,24 @@ exports[`DeleteAccount should match default section snapshot 1`] = `
    We're sorry to see you go!
  </p>
  <p>
-    Please note: Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.
+    Please note: Deletion of your account and personal data is permanent and cannot be undone. localhost will not be able to recover your account or the data that is deleted.
  </p>
  <p>
-    Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.
+    Once your account is deleted, you cannot use it to take courses on localhost.
  </p>
  <p>
    <span>
-      You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, 
-      <a
-        href="https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_certificates.html#printing-a-certificate"
-        onClick={[Function]}
-        target="_self"
-      >
-        follow the instructions for printing or downloading a certificate
-      </a>
-      .
+      You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
    </span>
  </p>
  <p
    className="text-danger h6"
  >
-    Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on edX.
+    Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on localhost.
  </p>
  <p>
    <a
+      className="default-link standalone-link"
      href="https://support.edx.org/hc/en-us/sections/115004139268-Manage-Your-Account-Settings"
      onClick={[Function]}
      target="_self"
@@ -67,31 +60,24 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
    We're sorry to see you go!
  </p>
  <p>
-    Please note: Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.
+    Please note: Deletion of your account and personal data is permanent and cannot be undone. localhost will not be able to recover your account or the data that is deleted.
  </p>
  <p>
-    Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.
+    Once your account is deleted, you cannot use it to take courses on localhost.
  </p>
  <p>
    <span>
-      You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, 
-      <a
-        href="https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_certificates.html#printing-a-certificate"
-        onClick={[Function]}
-        target="_self"
-      >
-        follow the instructions for printing or downloading a certificate
-      </a>
-      .
+      You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
    </span>
  </p>
  <p
    className="text-danger h6"
  >
-    Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on edX.
+    Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on localhost.
  </p>
  <p>
    <a
+      className="default-link standalone-link"
      href="https://support.edx.org/hc/en-us/sections/115004139268-Manage-Your-Account-Settings"
      onClick={[Function]}
      target="_self"
@@ -135,6 +121,7 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `
      <span>
        Before proceeding, please 
        <a
+          className="default-link standalone-link"
          href="https://support.edx.org/hc/en-us/articles/115000940568-How-do-I-activate-my-account-"
          onClick={[Function]}
          target="_self"
@@ -159,31 +146,24 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = `
    We're sorry to see you go!
  </p>
  <p>
-    Please note: Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.
+    Please note: Deletion of your account and personal data is permanent and cannot be undone. localhost will not be able to recover your account or the data that is deleted.
  </p>
  <p>
-    Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.
+    Once your account is deleted, you cannot use it to take courses on localhost.
  </p>
  <p>
    <span>
-      You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, 
-      <a
-        href="https://edx.readthedocs.io/projects/edx-guide-for-students/en/latest/SFD_certificates.html#printing-a-certificate"
-        onClick={[Function]}
-        target="_self"
-      >
-        follow the instructions for printing or downloading a certificate
-      </a>
-      .
+      You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.
    </span>
  </p>
  <p
    className="text-danger h6"
  >
-    Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on edX.
+    Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on localhost.
  </p>
  <p>
    <a
+      className="default-link standalone-link"
      href="https://support.edx.org/hc/en-us/sections/115004139268-Manage-Your-Account-Settings"
      onClick={[Function]}
      target="_self"
@@ -227,6 +207,7 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = `
      <span>
        Before proceeding, please 
        <a
+          className="default-link standalone-link"
          href="https://support.edx.org/hc/en-us/articles/207206067"
          onClick={[Function]}
          target="_self"
--- a/src/account-settings/delete-account/messages.js
+++ b/src/account-settings/delete-account/messages.js
@@ -13,22 +13,27 @@ const messages = defineMessages({
  },
  'account.settings.delete.account.text.1': {
    id: 'account.settings.delete.account.text.1',
-    defaultMessage: 'Please note: Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.',
+    defaultMessage: 'Please note: Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.',
    description: 'A message in the user account deletion area',
  },
  'account.settings.delete.account.text.2': {
    id: 'account.settings.delete.account.text.2',
-    defaultMessage: 'Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.',
+    defaultMessage: 'Once your account is deleted, you cannot use it to take courses on {siteName}.',
    description: 'A message in the user account deletion area',
  },
+  'account.settings.delete.account.text.2.edX': {
+    id: 'account.settings.delete.account.text.2.edX',
+    defaultMessage: 'Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.',
+    description: 'A message in the user account deletion area. This message will NOT be used on Open edX installations. Please do not translate \'MIT Open Learning\', \'Wharton Executive Education\', or \'Harvard Medical School\'',
+  },
  'account.settings.delete.account.text.3.link': {
    id: 'account.settings.delete.account.text.3.link',
-    defaultMessage: 'follow the instructions for printing or downloading a certificate',
-    description: 'This text will be a link to a technical support page; it will go in the phrase If you want to make a copy of these for your records, ______ .',
+    defaultMessage: 'Follow these instructions for printing or downloading a certificate',
+    description: 'This text is a link to a technical support page where users can learn how to print or download their certificates.',
  },
  'account.settings.delete.account.text.warning': {
    id: 'account.settings.delete.account.text.warning',
-    defaultMessage: 'Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on edX.',
+    defaultMessage: 'Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on {siteName}.',
    description: 'A message in the user account deletion area',
  },
  'account.settings.delete.account.text.change.instead': {
@@ -39,17 +44,17 @@ const messages = defineMessages({
  'account.settings.delete.account.button': {
    id: 'account.settings.delete.account.button',
    defaultMessage: 'Delete My Account',
-    description: 'Button label to permanently delete your edX account',
+    description: 'Button label to permanently delete your platform account',
  },
  'account.settings.delete.account.please.activate': {
    id: 'account.settings.delete.account.please.activate',
-    defaultMessage: 'activate your account',
-    description: 'This is the text on a link that goes to the support page.  It is part of this sentence: Before proceeding, please activate your account.',
+    defaultMessage: 'Before proceeding, please {linkStart}activate your account{linkEnd}',
+    description: 'This message links to a support article',
  },
  'account.settings.delete.account.please.unlink': {
    id: 'account.settings.delete.account.please.unlink',
-    defaultMessage: 'unlink all social media accounts',
-    description: 'This is the text on a link that goes to the support page.  It is part of this sentence: Before proceeding, please unlink all social media accounts.',
+    defaultMessage: 'Before proceeding, please {linkStart}unlink all social media accounts{linkEnd}',
+    description: 'This message links to a support article',
  },
  'account.settings.delete.account.modal.header': {
    id: 'account.settings.delete.account.modal.header',
@@ -58,14 +63,19 @@ const messages = defineMessages({
  },
  'account.settings.delete.account.modal.text.1': {
    id: 'account.settings.delete.account.modal.text.1',
-    defaultMessage: 'You have selected "Delete My Account". Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.',
+    defaultMessage: 'You have selected "Delete My Account". Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.',
    description: 'Messaging in the dialog asking user to confirm that they want to delete their entire account',
  },
  'account.settings.delete.account.modal.text.2': {
    id: 'account.settings.delete.account.modal.text.2',
-    defaultMessage: 'If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer\'s or university\'s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.',
+    defaultMessage: 'If you proceed, you will be unable to use this account to take courses on {siteName}.',
    description: 'Messaging in the dialog asking user to confirm that they want to delete their entire account',
  },
+  'account.settings.delete.account.modal.text.2.edX': {
+    id: 'account.settings.delete.account.modal.text.2.edX',
+    defaultMessage: 'If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer\'s or university\'s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.',
+    description: 'Messaging in the dialog asking user to confirm that they want to delete their entire account. This message will NOT be used on Open edX installations. Please do not translate \'MIT Open Learning\', \'Wharton Executive Education\', or \'Harvard Medical School\'',
+  },
  'account.settings.delete.account.modal.enter.password': {
    id: 'account.settings.delete.account.modal.enter.password',
    defaultMessage: 'If you still wish to continue and delete your account, please enter your account password:',
--- a/src/account-settings/demographics/DemographicsSection.jsx
+++ b/src/account-settings/demographics/DemographicsSection.jsx
@@ -172,7 +172,12 @@ class DemographicsSection extends React.Component {
            target="_blank"
            rel="noopener noreferrer"
          >
-            {this.props.intl.formatMessage(messages['account.settings.section.demographics.why'])}
+            {this.props.intl.formatMessage(
+              messages['account.settings.section.demographics.why'],
+              {
+                siteName: getConfig().SITE_NAME,
+              },
+            )}
          </Hyperlink>
        </p>
        {this.renderDemographicsServiceIssueWarning()}
--- a/src/account-settings/demographics/DemographicsSection.messages.jsx
+++ b/src/account-settings/demographics/DemographicsSection.messages.jsx
@@ -162,7 +162,7 @@ const messages = defineMessages({
  /* Legal copy link text */
  'account.settings.section.demographics.why': {
    id: 'account.settings.section.demographics.why',
-    defaultMessage: 'Why does edX collect this information?',
+    defaultMessage: 'Why does {siteName} collect this information?',
    description: 'Link text for a link to external legal text',
  },
 });
--- a/src/account-settings/demographics/test/snapshots/DemographicsSection.test.jsx.snap
+++ b/src/account-settings/demographics/test/snapshots/DemographicsSection.test.jsx.snap
@@ -12,20 +12,43 @@ exports[`DemographicsSection should render 1`] = `
  </h2>
  <p>
    <a
+      className="default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
      rel="noopener noopener noreferrer"
      target="_blank"
    >
-      Why does edX collect this information?
-      <span>
+      Why does localhost collect this information?
+      <span
+        className="d-inline-block align-text-top"
+      >
         
        <span
-          aria-hidden={false}
-          aria-label="Opens in a new window"
-          className="fa fa-external-link"
-          title="Opens in a new window"
-        />
+          className="pgn__icon"
+          style={
+            Object {
+              "height": "1em",
+              "width": "1em",
+            }
+          }
+        >
+          <svg
+            aria-hidden={true}
+            aria-label=""
+            fill="none"
+            focusable={false}
+            height={24}
+            role="img"
+            viewBox="0 0 24 24"
+            width={24}
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M19 19H5V5h7V3H3v18h18v-9h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
+              fill="currentColor"
+            />
+          </svg>
+        </span>
      </span>
    </a>
  </p>
@@ -85,6 +108,7 @@ exports[`DemographicsSection should render 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -148,6 +172,7 @@ exports[`DemographicsSection should render 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            <button
@@ -218,6 +243,7 @@ exports[`DemographicsSection should render 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -281,6 +307,7 @@ exports[`DemographicsSection should render 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -344,6 +371,7 @@ exports[`DemographicsSection should render 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -407,6 +435,7 @@ exports[`DemographicsSection should render 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -470,6 +499,7 @@ exports[`DemographicsSection should render 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -533,6 +563,7 @@ exports[`DemographicsSection should render 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -596,6 +627,7 @@ exports[`DemographicsSection should render 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -622,20 +654,43 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
  </h2>
  <p>
    <a
+      className="default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
      rel="noopener noopener noreferrer"
      target="_blank"
    >
-      Why does edX collect this information?
-      <span>
+      Why does localhost collect this information?
+      <span
+        className="d-inline-block align-text-top"
+      >
         
        <span
-          aria-hidden={false}
-          aria-label="Opens in a new window"
-          className="fa fa-external-link"
-          title="Opens in a new window"
-        />
+          className="pgn__icon"
+          style={
+            Object {
+              "height": "1em",
+              "width": "1em",
+            }
+          }
+        >
+          <svg
+            aria-hidden={true}
+            aria-label=""
+            fill="none"
+            focusable={false}
+            height={24}
+            role="img"
+            viewBox="0 0 24 24"
+            width={24}
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M19 19H5V5h7V3H3v18h18v-9h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
+              fill="currentColor"
+            />
+          </svg>
+        </span>
      </span>
    </a>
  </p>
@@ -709,6 +764,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -772,6 +828,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            <button
@@ -842,6 +899,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -905,6 +963,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -968,6 +1027,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -1031,6 +1091,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -1094,6 +1155,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -1157,6 +1219,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -1220,6 +1283,7 @@ exports[`DemographicsSection should render an Alert if an error occurs 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -1246,20 +1310,43 @@ exports[`DemographicsSection should render an Alert when demographicsOptions pro
  </h2>
  <p>
    <a
+      className="default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
      rel="noopener noopener noreferrer"
      target="_blank"
    >
-      Why does edX collect this information?
-      <span>
+      Why does localhost collect this information?
+      <span
+        className="d-inline-block align-text-top"
+      >
         
        <span
-          aria-hidden={false}
-          aria-label="Opens in a new window"
-          className="fa fa-external-link"
-          title="Opens in a new window"
-        />
+          className="pgn__icon"
+          style={
+            Object {
+              "height": "1em",
+              "width": "1em",
+            }
+          }
+        >
+          <svg
+            aria-hidden={true}
+            aria-label=""
+            fill="none"
+            focusable={false}
+            height={24}
+            role="img"
+            viewBox="0 0 24 24"
+            width={24}
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M19 19H5V5h7V3H3v18h18v-9h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
+              fill="currentColor"
+            />
+          </svg>
+        </span>
      </span>
    </a>
  </p>
@@ -1292,20 +1379,43 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
  </h2>
  <p>
    <a
+      className="default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
      rel="noopener noopener noreferrer"
      target="_blank"
    >
-      Why does edX collect this information?
-      <span>
+      Why does localhost collect this information?
+      <span
+        className="d-inline-block align-text-top"
+      >
         
        <span
-          aria-hidden={false}
-          aria-label="Opens in a new window"
-          className="fa fa-external-link"
-          title="Opens in a new window"
-        />
+          className="pgn__icon"
+          style={
+            Object {
+              "height": "1em",
+              "width": "1em",
+            }
+          }
+        >
+          <svg
+            aria-hidden={true}
+            aria-label=""
+            fill="none"
+            focusable={false}
+            height={24}
+            role="img"
+            viewBox="0 0 24 24"
+            width={24}
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M19 19H5V5h7V3H3v18h18v-9h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
+              fill="currentColor"
+            />
+          </svg>
+        </span>
      </span>
    </a>
  </p>
@@ -1365,6 +1475,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -1428,6 +1539,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Hispanic, Latin, or Spanish origin, White
@@ -1491,6 +1603,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -1554,6 +1667,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -1617,6 +1731,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -1680,6 +1795,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -1743,6 +1859,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -1806,6 +1923,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -1869,6 +1987,7 @@ exports[`DemographicsSection should render ethnicity correctly when multiple opt
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -1895,20 +2014,43 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
  </h2>
  <p>
    <a
+      className="default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
      rel="noopener noopener noreferrer"
      target="_blank"
    >
-      Why does edX collect this information?
-      <span>
+      Why does localhost collect this information?
+      <span
+        className="d-inline-block align-text-top"
+      >
         
        <span
-          aria-hidden={false}
-          aria-label="Opens in a new window"
-          className="fa fa-external-link"
-          title="Opens in a new window"
-        />
+          className="pgn__icon"
+          style={
+            Object {
+              "height": "1em",
+              "width": "1em",
+            }
+          }
+        >
+          <svg
+            aria-hidden={true}
+            aria-label=""
+            fill="none"
+            focusable={false}
+            height={24}
+            role="img"
+            viewBox="0 0 24 24"
+            width={24}
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M19 19H5V5h7V3H3v18h18v-9h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
+              fill="currentColor"
+            />
+          </svg>
+        </span>
      </span>
    </a>
  </p>
@@ -1968,6 +2110,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -2031,6 +2174,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Asian
@@ -2094,6 +2238,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -2157,6 +2302,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -2220,6 +2366,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -2283,6 +2430,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -2346,6 +2494,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -2409,6 +2558,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -2472,6 +2622,7 @@ exports[`DemographicsSection should render ethnicity text correctly 1`] = `
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -2498,20 +2649,43 @@ exports[`DemographicsSection should set user input correctly when user provides
  </h2>
  <p>
    <a
+      className="default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
      rel="noopener noopener noreferrer"
      target="_blank"
    >
-      Why does edX collect this information?
-      <span>
+      Why does localhost collect this information?
+      <span
+        className="d-inline-block align-text-top"
+      >
         
        <span
-          aria-hidden={false}
-          aria-label="Opens in a new window"
-          className="fa fa-external-link"
-          title="Opens in a new window"
-        />
+          className="pgn__icon"
+          style={
+            Object {
+              "height": "1em",
+              "width": "1em",
+            }
+          }
+        >
+          <svg
+            aria-hidden={true}
+            aria-label=""
+            fill="none"
+            focusable={false}
+            height={24}
+            role="img"
+            viewBox="0 0 24 24"
+            width={24}
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M19 19H5V5h7V3H3v18h18v-9h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
+              fill="currentColor"
+            />
+          </svg>
+        </span>
      </span>
    </a>
  </p>
@@ -2571,6 +2745,7 @@ exports[`DemographicsSection should set user input correctly when user provides
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -2634,6 +2809,7 @@ exports[`DemographicsSection should set user input correctly when user provides
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            <button
@@ -2704,6 +2880,7 @@ exports[`DemographicsSection should set user input correctly when user provides
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -2767,6 +2944,7 @@ exports[`DemographicsSection should set user input correctly when user provides
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -2830,6 +3008,7 @@ exports[`DemographicsSection should set user input correctly when user provides
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -2893,6 +3072,7 @@ exports[`DemographicsSection should set user input correctly when user provides
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -2956,6 +3136,7 @@ exports[`DemographicsSection should set user input correctly when user provides
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Other: test
@@ -3019,6 +3200,7 @@ exports[`DemographicsSection should set user input correctly when user provides
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -3082,6 +3264,7 @@ exports[`DemographicsSection should set user input correctly when user provides
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -3108,20 +3291,43 @@ exports[`DemographicsSection should set user input correctly when user provides
  </h2>
  <p>
    <a
+      className="default-link standalone-link"
      href="http://localhost:5335/demographics"
      onClick={[Function]}
      rel="noopener noopener noreferrer"
      target="_blank"
    >
-      Why does edX collect this information?
-      <span>
+      Why does localhost collect this information?
+      <span
+        className="d-inline-block align-text-top"
+      >
         
        <span
-          aria-hidden={false}
-          aria-label="Opens in a new window"
-          className="fa fa-external-link"
-          title="Opens in a new window"
-        />
+          className="pgn__icon"
+          style={
+            Object {
+              "height": "1em",
+              "width": "1em",
+            }
+          }
+        >
+          <svg
+            aria-hidden={true}
+            aria-label=""
+            fill="none"
+            focusable={false}
+            height={24}
+            role="img"
+            viewBox="0 0 24 24"
+            width={24}
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M19 19H5V5h7V3H3v18h18v-9h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
+              fill="currentColor"
+            />
+          </svg>
+        </span>
      </span>
    </a>
  </p>
@@ -3181,6 +3387,7 @@ exports[`DemographicsSection should set user input correctly when user provides
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer to self describe: test
@@ -3244,6 +3451,7 @@ exports[`DemographicsSection should set user input correctly when user provides
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            <button
@@ -3314,6 +3522,7 @@ exports[`DemographicsSection should set user input correctly when user provides
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -3377,6 +3586,7 @@ exports[`DemographicsSection should set user input correctly when user provides
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -3440,6 +3650,7 @@ exports[`DemographicsSection should set user input correctly when user provides
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -3503,6 +3714,7 @@ exports[`DemographicsSection should set user input correctly when user provides
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -3566,6 +3778,7 @@ exports[`DemographicsSection should set user input correctly when user provides
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -3629,6 +3842,7 @@ exports[`DemographicsSection should set user input correctly when user provides
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
@@ -3692,6 +3906,7 @@ exports[`DemographicsSection should set user input correctly when user provides
            </button>
          </div>
          <p
+            className={null}
            data-hj-suppress={true}
          >
            Prefer not to respond
--- a/src/account-settings/third-party-auth/ThirdPartyAuth.jsx
+++ b/src/account-settings/third-party-auth/ThirdPartyAuth.jsx
@@ -100,7 +100,7 @@ class ThirdPartyAuth extends Component {
      <FormattedMessage
        id="account.settings.sso.no.providers"
        defaultMessage="No accounts can be linked at this time."
-        description="Displayed when no third party accounts are available to link an edX account to"
+        description="Displayed when no third-party accounts are available for the user to link to their account on the platform."
      />
    );
  }
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -1,5 +1,5 @@
 {
-  "account.settings.message.duplicate.tpa.provider": "إنّ حساب {provider} الذي اخترتَه مرتبط مسبقًا بحساب آخر في edX. ",
+  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another {siteName} account.",
  "account.settings.message.managed.settings": "تتم إدارة إعدادات الملف الشخصي بواسطة {ManagerTitle}. اتصل بالمسؤول أو {support} للحصول على المساعدة.",
  "account.settings.message.managed.settings.support": "الدعم",
  "account.settings.page.heading": "إعدادات الحساب",
@@ -14,16 +14,27 @@
  "account.settings.section.demographics.information": "معلومات اختيارية",
  "account.settings.section.site.preferences": "تفضيلات الموقع",
  "account.settings.section.linked.accounts": "الحسابات المرتبطة",
-  "account.settings.section.linked.accounts.description": "يمكنك ربط حساباتك الشخصية لتسهيل عملية تسجيل دخولك إلى edX.",
+  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to {siteName}.",
  "account.settings.field.username": "اسم المستخدم",
-  "account.settings.field.username.help.text": "اسم المستخدم الخاص بك الذي يميزك في edX. لا يمكنك تغيير اسم المستخدم الخاص بك لاحقاً.",
+  "account.settings.field.username.help.text": "The name that identifies you on {siteName}. You cannot change your username.",
  "account.settings.field.full.name": "الاسم الكامل",
  "account.settings.field.full.name.empty": "إضافة اسم",
  "account.settings.field.full.name.help.text": "الاسم المستخدم للتحقق من هويتك والذي سوف يظهر على الشهادات الخاصة بك.",
+  "account.settings.field.name.verified": "Verified name",
+  "account.settings.field.name.verified.help.text.verified": "This name has been verified by government ID.",
+  "account.settings.field.name.verified.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Verified name cannot be changed at this time.",
+  "account.settings.field.full.name.help.text.submitted": "When identity verification is successful, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
+  "account.settings.field.name.verified.success.message": "Your identity verification request has successfully completed. You now have the option of selecting which name you prefer to appear on your certificates and public-records.",
+  "account.settings.field.name.verified.success.message.header": "Your name change request is complete!",
+  "account.settings.field.name.verified.failure.message": "Your Verified name change attempt, “{verifiedName}”, did not pass ID verification. Your previous Verified name settings have been restored.",
+  "account.settings.field.name.verified.failure.message.header": "We were not able to verify your identity.",
+  "account.settings.field.name.verified.failure.message.help.link": "Learn more about ID verification",
+  "account.settings.field.name.verified.submitted.message": "Your identity verification request has been submitted and usually takes between 24 and 48 hours to complete. When your request is approved, your updated name will appear on all associated certificates and public-facing records.",
+  "account.settings.field.name.verified.submitted.message.header": "Your name change request is almost complete!",
  "account.settings.field.email": "البريد الالكتروني (الدخول)",
  "account.settings.field.email.empty": "إضافة عنوان البريد الإلكتروني",
  "account.settings.field.email.confirmation": "لقد أرسلنا رسالة تأكيد إلى {value}. انقر فوق الرابط في الرسالة لتحديث عنوان بريدك الإلكتروني.",
-  "account.settings.field.email.help.text": "أنت تتلقى رسائل من edX وفرق المساق على هذا العنوان.",
+  "account.settings.field.email.help.text": "You receive messages from {siteName} and course teams at this address.",
  "account.settings.field.secondary.email": "عنوان البريد الإلكتروني للاسترداد",
  "account.settings.field.secondary.email.empty": "إضافة عنوان البريد الإلكتروني للاسترداد",
  "account.settings.field.secondary.email.confirmation": "لقد أرسلنا رسالة تأكيد إلى {value}. انقر فوق الرابط في الرسالة لتحديث عنوان بريد الاسترداد الإلكتروني.",
@@ -67,7 +78,7 @@
  "account.settings.field.time.zone.all": "جميع المناطق الزمنية",
  "account.settings.field.time.zone.country": "المنطقة الزمنية للدولة",
  "account.settings.section.social.media": "روابط منصات التواصل الإجتماعي",
-  "account.settings.section.social.media.description": "اختياريا، قم بربط حساباتك الشخصية بأيقونات منصات التواصل الاجتماعي في ملف التعريف الخاص بك.",
+  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your {siteName} profile.",
  "account.settings.field.social.platform.name.linkedin": "لينكد إن",
  "account.settings.field.social.platform.name.linkedin.empty": "إضافة عنوان ملف لينكد إن ",
  "account.settings.jump.nav.delete.account": "احذف حسابي",
@@ -101,17 +112,19 @@
  "account.settings.delete.account.before.proceeding": "قبل المتابعة، يرجى {actionLink}.",
  "account.settings.delete.account.header": "احذف حسابي",
  "account.settings.delete.account.subheader": "نأسف لذهابك!",
-  "account.settings.delete.account.text.1": "يرجى ملاحظة: إن حذف حسابك والبيانات الشخصية قرار نهائي ولا يمكن التراجع عنه. لن تتمكن edX من استعادة حسابك أو البيانات التي تم حذفها.",
-  "account.settings.delete.account.text.2": "بمجرد حذف حسابك ، لا يمكنك استخدامه لأخذ دورات تدريبية على تطبيق edX أو edx.org أو أي موقع آخر تستضيفه edX. وهذا يشمل الوصول إلى edx.org من نظام صاحب العمل أو الجامعة والوصول إلى المواقع الخاصة التي تقدمها MIT Open Learning و Wharton Executive Education و Harvard Medical School.",
-  "account.settings.delete.account.text.3.link": "اتبع الإرشادات التالية لطباعة أو تحميل شهادة.",
-  "account.settings.delete.account.text.warning": "تحذير: حذف الحساب قرار نهائي. يرجى قراءة ما سبق بعناية قبل المتابعة. هذا إجراء لا رجعة فيه، ولن تتمكن بعد الآن من استخدام البريد الإلكتروني نفسه على edX.",
+  "account.settings.delete.account.text.1": "Please note: Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
+  "account.settings.delete.account.text.2": "Once your account is deleted, you cannot use it to take courses on {siteName}.",
+  "account.settings.delete.account.text.2.edX": "Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
+  "account.settings.delete.account.text.3.link": "Follow these instructions for printing or downloading a certificate",
+  "account.settings.delete.account.text.warning": "Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on {siteName}.",
  "account.settings.delete.account.text.change.instead": "هل تريد تغيير البريد الإلكتروني أو الاسم أو كلمة المرور بدلاً من ذلك؟",
  "account.settings.delete.account.button": "احذف حسابي",
  "account.settings.delete.account.please.activate": "تنشيط حسابك",
  "account.settings.delete.account.please.unlink": "إلغاء ربط جميع حسابات التواصل الاجتماعي",
  "account.settings.delete.account.modal.header": "هل أنت متأكد؟",
-  "account.settings.delete.account.modal.text.1": "لقد حددت \"حذف حسابي\". إن حذف حسابك وبياناتك الشخصية قرار نهائي لا يمكن التراجع عنه. لن تتمكن edX من استعادة حسابك أو البيانات التي تم حذفها.",
-  "account.settings.delete.account.modal.text.2": "عند المتابعة، فلن تتمكن من استخدام هذا الحساب للحصول على مساقات على تطبيق edX أو edx.org أو أي موقع آخر يستضيفه edX. وهذا يشمل الوصول إلى edx.org من نظام صاحب العمل أو الجامعة والوصول إلى المواقع الخاصة التي يقدمها معهد ماساتشوستس للتكنولوجيا التعليم المفتوح، وارتون التعليم التنفيذي، وكلية هارفارد الطبية.",
+  "account.settings.delete.account.modal.text.1": "You have selected \"Delete My Account\". Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
+  "account.settings.delete.account.modal.text.2": "If you proceed, you will be unable to use this account to take courses on {siteName}.",
+  "account.settings.delete.account.modal.text.2.edX": "If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
  "account.settings.delete.account.modal.enter.password": "إذا كنت لا تزال ترغب في المتابعة وحذف حسابك ، فيرجى إدخال كلمة مرور حسابك:",
  "account.settings.delete.account.modal.confirm.delete": "تعم، أحذف",
  "account.settings.delete.account.modal.confirm.cancel": "إلغاء",
@@ -122,7 +135,8 @@
  "account.settings.delete.account.modal.after.header": "نأسف لذهابك! سيتم حذف حسابك قريبا.",
  "account.settings.delete.account.modal.after.text": "قد يستغرق حذف الحساب ، بما في ذلك الإزالة من قوائم البريد الإلكتروني ، بضعة أسابيع حتى تتم معالجته بالكامل من خلال نظامنا. إذا كنت ترغب في إلغاء الاشتراك في رسائل البريد الإلكتروني قبل ذلك الحين ، يرجى إلغاء الاشتراك من تذييل أي بريد إلكتروني.",
  "account.settings.delete.account.modal.after.button": "إغلاق ",
-  "account.settings.delete.account.text.3": "قد تفقد أيضًا إمكانية الوصول إلى الشهادات التي تم التحقق منها وبيانات اعتماد البرامج الأخرى مثل شهادات MicroMasters. إذا أردت عمل نسخة من هذه السجلات قبل متابعة الحذف، {actionLink}.",
+  "account.settings.delete.account.text.3.edX": "You may also lose access to verified certificates and other program credentials like MicroMasters certificates. You can make a copy of these for your records before proceeding with deletion. {actionLink}.",
+  "account.settings.delete.account.text.3": "You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.",
  "account.settings.message.demographics.service.issue": "حدث خطأ أثناء محاولة استرداد معلومات حسابك أو حفظها. يرجى المحاولة مرة أخرى لاحقًا.",
  "account.settings.field.demographics.gender": "هوية الجنس",
  "account.settings.field.demographics.gender.empty": "إضافة هوية الجنس",
@@ -153,7 +167,7 @@
  "account.settings.field.demographics.future_work_sector": "مجال العمل المستقبلي",
  "account.settings.field.demographics.future_work_sector.empty": "إضافة مجال العمل",
  "account.settings.field.demographics.work_sector.options.empty": "حدد مجال العمل",
-  "account.settings.section.demographics.why": "لماذا تجمع edX هذه المعلومات؟",
+  "account.settings.section.demographics.why": "Why does {siteName} collect this information?",
  "error.notfound.message": "الصفحة التي تبحث عنها غير متوفرة أو هناك خطأ في نص الرابط. الرجاء التحقق من الرابط والمحاولة مجددا.",
  "account.settings.editable.field.password.reset.button.confirmation.support.link": "الدعم الفني",
  "account.settings.editable.field.password.reset.button.confirmation": "لقد أرسلنا رسالة إلى {email}. انقر فوق الرابط في الرسالة لإعادة تعيين كلمة المرور. إذا لم يتم استلام الرسالة؟ اتصل بـ {technicalSupportLink}.",
@@ -168,6 +182,7 @@
  "id.verification.access.blocked.denied": "لا يمكنك التحقق من هويتك في الوقت الحالي. إذا لم تقم بعد بتنشيط حسابك، فيرجى التحقق من مجلد البريد المهمل للحصول على رسالة التفعيل من {email}.",
  "id.verification.next": "التالي",
  "id.verification.support": "support",
+  "id.verification.continue.upload": "Continue with Upload",
  "id.verification.example.card.alt": "مثال على بطاقة هوية صحيحة بالاسم الكامل وصورة.",
  "id.verification.requirements.title": "متطلبات التحقق من الصورة",
  "id.verification.requirements.description": "يجب عليك اتباع الآتي لإكمال عملية التحقق الإلكتروني من هويتك:",
@@ -176,10 +191,10 @@
  "id.verification.requirements.card.id.title": "صورة التحقق من الشخصية.",
  "id.verification.requirements.card.id.text": "تحتاج إلى بطاقة هوية صحيحة للتحقق تحوي اسمك الكامل وصورتك.",
  "id.verification.privacy.title": "بيانات الخصوصية.",
-  "id.verification.privacy.need.photo.question": "لماذا تحتاج edX إلى صورتي؟ ",
+  "id.verification.privacy.need.photo.question": "Why does {siteName} need my photo?",
  "id.verification.privacy.need.photo.answer": "نستخدم صور التحقق الخاصة بك لتأكيد هويتك والتأكد من صحة شهادتك.",
-  "id.verification.privacy.do.with.photo.question": "ما الذي تفعله edX بهذه الصورة؟",
-  "id.verification.privacy.do.with.photo.answer": "سنقوم بتشفير صورتك بأمان وإرسالها لخدمة التحقق للمراجعة . لن يتم حفظ صورتك ومعلوماتك أو عرضها في أي مكان على edX بعد اكتمال عملية التحقق.",
+  "id.verification.privacy.do.with.photo.question": "What does {siteName} do with this photo?",
+  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on {siteName} after the verification process is complete.",
  "id.verification.access.blocked.title": "التحقق من الهوية",
  "id.verification.access.blocked.enrollment": "أنت الآن ملتحق بمساق يتطلب التحقق من الهوية.",
  "id.verification.access.blocked.pending": "لقد قمت بالفعل بإرسال معلومات التحقق الخاصة بك. ستصلك رسالة على لوحة المعلومات عند اكتمال عملية التحقق (عادةً خلال 5 أيام).",
@@ -254,7 +269,7 @@
  "id.verification.camera.help.sight.answer.id": "قد تتمكن من إكمال إجراء التقاط الصور من دون مساعدة، ولكن قد يتطلب الأمر بضع محاولات لضبط وضع الكاميرا بشكل صحيح. يختلف الوضع الأمثل للكاميرا باختلاف جهاز الكمبيوتر، ولكن بشكل عام، يكون أفضل وضع لصورة بطاقة تعريف من 8 إلى 12 بوصة (من 20 إلى 30 سم) عن الكاميرا، مع وضع بطاقة الهوية في الوسط بالنسبة للكاميرا. إذا تم رفض الصور التي ترسلها، فحاول تحريك اتجاه الكمبيوتر أو الكاميرا لتغيير زاوية الإضاءة. إن السبب الأكثر شيوعاً للرفض هو عدم القدرة على قراءة النص الموجود على بطاقة الهوية.",
  "id.verification.camera.help.difficulty.question.portrait": "ماذا لو واجهت صعوبة في تثبيت رأسي في الموضع المناسب للكاميرا؟",
  "id.verification.camera.help.difficulty.question.id": "ماذا لو واجهت صعوبة في تثبيت بطاقة هويتي في الموضع المناسب للكاميرا؟",
-  "id.verification.camera.help.difficulty.answer": "إذا كنت بحاجة إلى المساعدة في التقاط صورة للتقديم، فاتصل بدعم edX للحصول على اقتراحات إضافية.",
+  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.",
  "id.verification.camera.help.upload.question": "What if I want to upload a photo instead?",
  "id.verification.camera.help.upload.answer": "On the next page you will have the option to switch to upload mode. By selecting that option, you will be able to upload a photo instead.",
  "id.verification.id.photo.unclear.question": "هل صورة بطاقة الهوية غير واضحة أو ضبابية؟",
@@ -293,7 +308,7 @@
  "id.verification.submission.alert.error.id": "مطلوب صورة لبطاقة هويتك. يرجى إعادة التقاط صورة بطاقة الهوية.",
  "id.verification.submission.alert.error.name": "مطلوب اسم حساب صالح. يرجى تحديث اسم حسابك لمطابقة الاسم على هويتك.",
  "id.verification.submission.alert.error.unsupported": "One or more of the files you have uploaded is in an unsupported format. Please choose from the following: ",
-  "id.verification.review.error": "صفحة فريق دعم edX ",
+  "id.verification.review.error": "{siteName} Support Page",
  "id.verification.submitted.title": "جارِ التحقق من الهوية",
  "id.verification.submitted.text": "لقد تلقينا معلوماتك وجاري الآن العمل على التحقق من هويتك. ستصلك رسالة على لوحة المعلومات عند اكتمال عملية التحقق (عادةً خلال 5 أيام). في غضون ذلك، لا يزال بإمكانك الوصول إلى كل محتوى المساق المتوفر.",
  "id.verification.return.dashboard": "العودة إلى لوحة المعلومات",
--- a/src/i18n/messages/es_419.json
+++ b/src/i18n/messages/es_419.json
@@ -1,5 +1,5 @@
 {
-  "account.settings.message.duplicate.tpa.provider": "La cuenta de {provider} seleccionada ya está vinculada con otra cuenta de edX. ",
+  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another {siteName} account.",
  "account.settings.message.managed.settings": "Los ajustes en el perfil son administrados por {managerTitle}. Contacte su administrador o {support} para obtener ayuda.",
  "account.settings.message.managed.settings.support": "soporte",
  "account.settings.page.heading": "Configuración de cuenta",
@@ -14,16 +14,27 @@
  "account.settings.section.demographics.information": "Información opcional",
  "account.settings.section.site.preferences": "Preferencias del sitio",
  "account.settings.section.linked.accounts": "Cuentas vinculadas",
-  "account.settings.section.linked.accounts.description": "Puedes vincular tus cuentas de redes sociales para simplificar el proceso de iniciar sesión en edX.",
+  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to {siteName}.",
  "account.settings.field.username": "Nombre de usuario",
-  "account.settings.field.username.help.text": "El nombre que lo identifica en edX. No podrá cambiar el nombre de usuario.",
+  "account.settings.field.username.help.text": "The name that identifies you on {siteName}. You cannot change your username.",
  "account.settings.field.full.name": "Nombre completo",
  "account.settings.field.full.name.empty": "Añade nombre",
  "account.settings.field.full.name.help.text": "El nombre que es usado para la verificación de identidad y aparece en sus certificados.",
+  "account.settings.field.name.verified": "Verified name",
+  "account.settings.field.name.verified.help.text.verified": "This name has been verified by government ID.",
+  "account.settings.field.name.verified.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Verified name cannot be changed at this time.",
+  "account.settings.field.full.name.help.text.submitted": "When identity verification is successful, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
+  "account.settings.field.name.verified.success.message": "Your identity verification request has successfully completed. You now have the option of selecting which name you prefer to appear on your certificates and public-records.",
+  "account.settings.field.name.verified.success.message.header": "Your name change request is complete!",
+  "account.settings.field.name.verified.failure.message": "Your Verified name change attempt, “{verifiedName}”, did not pass ID verification. Your previous Verified name settings have been restored.",
+  "account.settings.field.name.verified.failure.message.header": "We were not able to verify your identity.",
+  "account.settings.field.name.verified.failure.message.help.link": "Más información sobre la verificación de ID",
+  "account.settings.field.name.verified.submitted.message": "Your identity verification request has been submitted and usually takes between 24 and 48 hours to complete. When your request is approved, your updated name will appear on all associated certificates and public-facing records.",
+  "account.settings.field.name.verified.submitted.message.header": "Your name change request is almost complete!",
  "account.settings.field.email": "Correo electrónico (Ingresar)",
  "account.settings.field.email.empty": "Agregar correo electrónico",
  "account.settings.field.email.confirmation": "Le enviamos un mensaje de confirmación a  {value}. Hacer click en la liga del mensaje para actualizar su correo electrónico.",
-  "account.settings.field.email.help.text": "Recibes mensajes de edX y equipos del curso en esta dirección.",
+  "account.settings.field.email.help.text": "You receive messages from {siteName} and course teams at this address.",
  "account.settings.field.secondary.email": "Correo electrónico de recuperación",
  "account.settings.field.secondary.email.empty": "Agregar un correo electrónico de recuperación",
  "account.settings.field.secondary.email.confirmation": "Le enviamos un mensaje de confirmación a  {value}. Hacer click en la liga del mensaje para actualizar su correo electrónico.",
@@ -67,7 +78,7 @@
  "account.settings.field.time.zone.all": "Todas las zonas horarias",
  "account.settings.field.time.zone.country": "Zonas horarias",
  "account.settings.section.social.media": "Enlaces de redes sociales",
-  "account.settings.section.social.media.description": "Opcionalmente, conecte sus cuentas personales a los iconos de redes sociales en su perfil de edX.",
+  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your {siteName} profile.",
  "account.settings.field.social.platform.name.linkedin": "LinkedIn",
  "account.settings.field.social.platform.name.linkedin.empty": "Agregar perfil de LinkedIn",
  "account.settings.jump.nav.delete.account": "Eliminar mi cuenta",
@@ -101,17 +112,19 @@
  "account.settings.delete.account.before.proceeding": "Antes de continuar, por favor {actionLink}.",
  "account.settings.delete.account.header": "Eliminar mi cuenta",
  "account.settings.delete.account.subheader": "¡Sentimos que te vayas!",
-  "account.settings.delete.account.text.1": "Cuidado: la eliminación de tu cuenta y datos personales es permanente e irreversible. edX no podrá recuperar ni tu cuenta ni los datos eliminados.",
-  "account.settings.delete.account.text.2": "Una vez su cuenta haya sido eliminada, no la podrá usar para tomar cursos en la app de edX, edx.org o en cualquier otro sitio administrado por edX. Esto incluye el acceso a edx.org desde el sistema de su empleador o  universidad y el acceso a páginas privadas ofrecidas por MIT Open Learning, Wharton Executive Education y Harvard Medical School.",
-  "account.settings.delete.account.text.3.link": "siga las instrucciones para imprimir o descargar el certificado",
-  "account.settings.delete.account.text.warning": "Warning: La eliminación de la cuenta es permanente. Por favor lee la información de más arriba con atención antes de proceder. Esta es una acción irreversible, y no podrás volver a usar el mismo correo electrónico en edX.",
+  "account.settings.delete.account.text.1": "Please note: Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
+  "account.settings.delete.account.text.2": "Once your account is deleted, you cannot use it to take courses on {siteName}.",
+  "account.settings.delete.account.text.2.edX": "Una vez su cuenta haya sido eliminada, no la podrá usar para tomar cursos en la app de edX, edx.org o en cualquier otro sitio administrado por edX. Esto incluye el acceso a edx.org desde el sistema de su empleador o  universidad y el acceso a páginas privadas ofrecidas por MIT Open Learning, Wharton Executive Education y Harvard Medical School.",
+  "account.settings.delete.account.text.3.link": "Follow these instructions for printing or downloading a certificate",
+  "account.settings.delete.account.text.warning": "Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on {siteName}.",
  "account.settings.delete.account.text.change.instead": "En lugar de eso, ¿quieres cambiar tu correo electrónico, nombre o contraseña?",
  "account.settings.delete.account.button": "Eliminar mi cuenta",
  "account.settings.delete.account.please.activate": "activar su cuenta",
  "account.settings.delete.account.please.unlink": "Desvincular todas las cuentas de redes sociales.",
  "account.settings.delete.account.modal.header": "¿Está seguro?",
-  "account.settings.delete.account.modal.text.1": "Has seleccionado “Eliminar mi cuenta”. La eliminación de tu cuenta y datos personales es permanente e irreversible. edX no será capaz de recuperar tu cuenta o los datos que se hayan borrado.",
-  "account.settings.delete.account.modal.text.2": "Si procedes, no será posible usar esta cuenta para tomar cursos ni en la aplicación móvil de edX, ni en edx.org, ni en cualquier otro sitio hospedado por edX. Esto incluye el acceso a edx.org desde el sistema de tu empleador o universidad, y el acceso a sitios privados ofrecidos por MIT Open Learning, Wharton Executive Education, y Harvard Medical School.",
+  "account.settings.delete.account.modal.text.1": "You have selected \"Delete My Account\". Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
+  "account.settings.delete.account.modal.text.2": "If you proceed, you will be unable to use this account to take courses on {siteName}.",
+  "account.settings.delete.account.modal.text.2.edX": "Si procedes, no será posible usar esta cuenta para tomar cursos ni en la aplicación móvil de edX, ni en edx.org, ni en cualquier otro sitio hospedado por edX. Esto incluye el acceso a edx.org desde el sistema de tu empleador o universidad, y el acceso a sitios privados ofrecidos por MIT Open Learning, Wharton Executive Education, y Harvard Medical School.",
  "account.settings.delete.account.modal.enter.password": "Si deseas continuar y eliminar tu cuenta, por favor introduce la contraseña de tu cuenta:",
  "account.settings.delete.account.modal.confirm.delete": "Si, Eliminar",
  "account.settings.delete.account.modal.confirm.cancel": "Cancelar",
@@ -122,7 +135,8 @@
  "account.settings.delete.account.modal.after.header": "¡Sentimos que te vayas! Tu cuenta será eliminada en breve.",
  "account.settings.delete.account.modal.after.text": "La eliminación de cuenta, incluyendo la eliminación de las listas de correo electrónico, puede tardar unas semanas en procesarse totalmente en nuestro sistema. Si quieres renunciar a recibir correos antes de que la eliminación se haya completado, por favor date de baja mediante el enlace que aparece al final de los correos.",
  "account.settings.delete.account.modal.after.button": "Cerrar",
-  "account.settings.delete.account.text.3": "Puede que también pierdas el acceso a los certificados verificados y otros certificados de programas como los de los MicroMasters. Si quieres hacer una copia de dichos certificados para tus archivos antes de proceder a la eliminación, {actionLink}.",
+  "account.settings.delete.account.text.3.edX": "You may also lose access to verified certificates and other program credentials like MicroMasters certificates. You can make a copy of these for your records before proceeding with deletion. {actionLink}.",
+  "account.settings.delete.account.text.3": "You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.",
  "account.settings.message.demographics.service.issue": "Ocurrió un error al intentar recuperar o guardar la información de tu cuenta. Por favor inténtalo más tarde.",
  "account.settings.field.demographics.gender": "Identidad de género",
  "account.settings.field.demographics.gender.empty": "Añade identidad de género",
@@ -153,7 +167,7 @@
  "account.settings.field.demographics.future_work_sector": "Área profesional futura",
  "account.settings.field.demographics.future_work_sector.empty": "Añade área profesional",
  "account.settings.field.demographics.work_sector.options.empty": "Selecciona área profesional",
-  "account.settings.section.demographics.why": "¿Por qué edX obtiene esta información?",
+  "account.settings.section.demographics.why": "Why does {siteName} collect this information?",
  "error.notfound.message": "La página que estas buscando no está disponible o hay un error en la URL. Por favor, comprueba la URL y vuelve a intentarlo.",
  "account.settings.editable.field.password.reset.button.confirmation.support.link": "soporte técnico",
  "account.settings.editable.field.password.reset.button.confirmation": "Hemos mandado un mensaje a {email}. Haz clic en el enlace en el mensaje para restablecer tu contraseña. ¿No recibiste el mensaje? Contáctate con {technicalSupportLink}.",
@@ -167,7 +181,8 @@
  "account.settings.sso.no.providers": "No se pueden vincular cuentas en este momento.",
  "id.verification.access.blocked.denied": "No puedes verificar tu identidad en este momento. Si aún tienes que activar tu cuenta, revisa tu carpeta de correo no deseado y busca el correo electrónico de activación de {email}.",
  "id.verification.next": "Siguiente",
-  "id.verification.support": "support",
+  "id.verification.support": "soporte",
+  "id.verification.continue.upload": "Continue with Upload",
  "id.verification.example.card.alt": "Ejemplo de un documento de identidad válido con foto y nombre completo.",
  "id.verification.requirements.title": "Requerimientos de verificación por foto",
  "id.verification.requirements.description": "Para completar la verificación por foto en línea, necesitarás lo siguiente:",
@@ -176,15 +191,15 @@
  "id.verification.requirements.card.id.title": "Identificación por foto",
  "id.verification.requirements.card.id.text": "Necesitas un documento de identidad válido que contenga tu foto y nombre completo.",
  "id.verification.privacy.title": "Información de privacidad",
-  "id.verification.privacy.need.photo.question": "¿Por qué edX necesita mi foto?",
+  "id.verification.privacy.need.photo.question": "Why does {siteName} need my photo?",
  "id.verification.privacy.need.photo.answer": "Utilizamos tus fotos de verificación para confirmar tu identidad y garantizar la validez de tu certificado.",
-  "id.verification.privacy.do.with.photo.question": "¿Qué hace edX con esta foto?",
-  "id.verification.privacy.do.with.photo.answer": "Encriptamos de forma segura tu foto y la enviamos a nuestro servicio de autorización para su revisión. Tu foto e información no se guardan ni se ven en ninguna parte de edX después de que se completa el proceso de verificación.",
+  "id.verification.privacy.do.with.photo.question": "What does {siteName} do with this photo?",
+  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on {siteName} after the verification process is complete.",
  "id.verification.access.blocked.title": "Verificación de identidad",
  "id.verification.access.blocked.enrollment": "Actualmente, no estás inscrito en un curso que requiera verificación de identidad.",
  "id.verification.access.blocked.pending": "Ya has enviado tu información de verificación de identidad. Recibirás un mensaje en tu panel principal cuando el proceso de verificación esté completado (usualmente dentro de los 5 días).",
  "id.verification.photo.take": "Tomar la foto",
-  "id.verification.photo.retake": "Retake Photo?",
+  "id.verification.photo.retake": "¿Tomar nuevamente la foto?",
  "id.verification.photo.enable.detection": "Habilitar la detección de rostro",
  "id.verification.photo.enable.detection.portrait.help.text": "Si está marcada, aparecerá un cuadro alrededor de tu cara. Tu rostro se puede ver claramente si el cuadro que lo rodea es azul. Si Tu cara no está en una buena posición o es indetectable, el cuadro será rojo.",
  "id.verification.photo.enable.detection.id.help.text": "Si está marcada, aparecerá una casilla alrededor de la cara de tu documento de identificación. La cara se puede ver claramente si la caja que la rodea es azul. Si la cara no está en una buena posición o es indetectable, el cuadro será rojo.",
@@ -254,7 +269,7 @@
  "id.verification.camera.help.sight.answer.id": "Es posible que puedas completar el procedimiento de captura de imágenes sin ayuda, pero es posible que necesites un par de intentos de envío para que la cámara se coloque correctamente. El posicionamiento óptimo de la cámara varía con cada computadora pero, generalmente, la mejor distancia para una foto de un documento de identificación es a 8 a 12 pulgadas (20 a 30 centímetros) de la cámara, con el documento de identificación centrado en relación con la cámara. Si las fotos que envías son rechazadas, intenta mover la computadora o la orientación de la cámara para cambiar el ángulo de iluminación. La razón más común de rechazo es la imposibilidad de leer el texto del documento de identidad.",
  "id.verification.camera.help.difficulty.question.portrait": "¿Qué sucede si tengo dificultades para mantener la cabeza en posición con respecto a la cámara?",
  "id.verification.camera.help.difficulty.question.id": "¿Qué sucede si tengo dificultades para mantener mi identificación en posición con respecto a la cámara?",
-  "id.verification.camera.help.difficulty.answer": "Si necesitas ayuda para tomar una foto para enviarla, comunícate con soporte de edX para obtener sugerencias adicionales.",
+  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.",
  "id.verification.camera.help.upload.question": "What if I want to upload a photo instead?",
  "id.verification.camera.help.upload.answer": "On the next page you will have the option to switch to upload mode. By selecting that option, you will be able to upload a photo instead.",
  "id.verification.id.photo.unclear.question": "¿La imagen de tu identificación no es clara o está demasiado borrosa?",
@@ -268,7 +283,7 @@
  "id.verification.id.photo.instructions.camera": "Cuando tu identificación esté en su lugar, usa el botón Tomar foto a continuación para tomar tu foto.",
  "id.verification.id.photo.instructions.upload": "Please upload an ID photo. Ensure the entire ID fits inside the frame and is well-lit. The file size must be under 10 MB. Supported formats: ",
  "id.verification.id.photo.instructions.upload.error.invalidFileType": "The file you have selected is not a supported image type. Please choose from the following formats: ",
-  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "The file you have selected is too large. Please try again with a file less than 10MB.",
+  "id.verification.id.photo.instructions.upload.error.fileTooLarge": "El archivo que has seleccionado es demasiado grande. Vuelve a intentarlo con un archivo de menos de 10 MB.",
  "id.verification.account.name.title": "Verificación de nombre de cuenta",
  "id.verification.account.name.instructions": "El nombre de tu cuenta y el nombre de tu identificación deben coincidir exactamente. De lo contrario, haz clic en \"No\" para actualizar el nombre de tu cuenta.",
  "id.verification.account.name.radio.label": "¿El nombre de tu identificación coincide con el nombre de la cuenta a continuación?",
@@ -293,7 +308,7 @@
  "id.verification.submission.alert.error.id": "Se requiere una foto de tu documento de ID. Vuelve a tomar tu foto de ID.",
  "id.verification.submission.alert.error.name": "Se requiere un nombre de cuenta válido. Actualiza el nombre de tu cuenta para que coincida con el nombre que figura en tu ID.",
  "id.verification.submission.alert.error.unsupported": "One or more of the files you have uploaded is in an unsupported format. Please choose from the following: ",
-  "id.verification.review.error": "Página de soporte de edX",
+  "id.verification.review.error": "{siteName} Support Page",
  "id.verification.submitted.title": "Verificación de identidad en progreso.",
  "id.verification.submitted.text": "Hemos recibido tu información y estamos verificando tu identidad. Verás un mensaje en tu tablero cuando se complete el proceso de verificación (generalmente en un periodo de 5 días). Mientras tanto, aún puedes acceder a todo el contenido del curso disponible.",
  "id.verification.return.dashboard": "Volver al panel principal",
@@ -314,5 +329,5 @@
  "id.verification.requirements.card.device.text": "Necesitas un dispositivo que tenga una cámara. Si has recibido un aviso del navegador para habilitar acceso a tu cámara, por favor asegúrate de seleccionar [allow].",
  "id.verification.account.name.summary.alert": "Your account settings are managed by {managerTitle}. If the name on your photo ID does not match the name on your account, please contact your {profileDataManager} administrator or {support} for help.",
  "idv.submission.alert.error": "\n          Se produjo un error técnico al intentar enviar la verificación de ID.\n          Es posible que sea una cuestión temporal, así que inténtalo de nuevo en unos minutos.\n          Si el problema continúa, dirígete a {support_link} para obtener ayuda.\n        ",
-  "id.verification.account.name.edit": "Edit {sr}"
+  "id.verification.account.name.edit": "Editar {sr}"
 }
--- a/src/i18n/messages/fr.json
+++ b/src/i18n/messages/fr.json
@@ -1,5 +1,5 @@
 {
-  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another edX account.",
+  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another {siteName} account.",
  "account.settings.message.managed.settings": "Your profile settings are managed by {managerTitle}. Contact your administrator or {support} for help.",
  "account.settings.message.managed.settings.support": "support",
  "account.settings.page.heading": "Account Settings",
@@ -14,16 +14,27 @@
  "account.settings.section.demographics.information": "Optional Information",
  "account.settings.section.site.preferences": "Site Preferences",
  "account.settings.section.linked.accounts": "Linked Accounts",
-  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to edX.",
+  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to {siteName}.",
  "account.settings.field.username": "Username",
-  "account.settings.field.username.help.text": "The name that identifies you on edX. You cannot change your username.",
+  "account.settings.field.username.help.text": "The name that identifies you on {siteName}. You cannot change your username.",
  "account.settings.field.full.name": "Full name",
  "account.settings.field.full.name.empty": "Add name",
  "account.settings.field.full.name.help.text": "The name that is used for ID verification and that appears on your certificates.",
+  "account.settings.field.name.verified": "Verified name",
+  "account.settings.field.name.verified.help.text.verified": "This name has been verified by government ID.",
+  "account.settings.field.name.verified.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Verified name cannot be changed at this time.",
+  "account.settings.field.full.name.help.text.submitted": "When identity verification is successful, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
+  "account.settings.field.name.verified.success.message": "Your identity verification request has successfully completed. You now have the option of selecting which name you prefer to appear on your certificates and public-records.",
+  "account.settings.field.name.verified.success.message.header": "Your name change request is complete!",
+  "account.settings.field.name.verified.failure.message": "Your Verified name change attempt, “{verifiedName}”, did not pass ID verification. Your previous Verified name settings have been restored.",
+  "account.settings.field.name.verified.failure.message.header": "We were not able to verify your identity.",
+  "account.settings.field.name.verified.failure.message.help.link": "Learn more about ID verification",
+  "account.settings.field.name.verified.submitted.message": "Your identity verification request has been submitted and usually takes between 24 and 48 hours to complete. When your request is approved, your updated name will appear on all associated certificates and public-facing records.",
+  "account.settings.field.name.verified.submitted.message.header": "Your name change request is almost complete!",
  "account.settings.field.email": "Email address (Sign in)",
  "account.settings.field.email.empty": "Add email address",
  "account.settings.field.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your email address.",
-  "account.settings.field.email.help.text": "You receive messages from edX and course teams at this address.",
+  "account.settings.field.email.help.text": "You receive messages from {siteName} and course teams at this address.",
  "account.settings.field.secondary.email": "Recovery email address",
  "account.settings.field.secondary.email.empty": "Add a recovery email address",
  "account.settings.field.secondary.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your recovery email address.",
@@ -67,7 +78,7 @@
  "account.settings.field.time.zone.all": "All time zones",
  "account.settings.field.time.zone.country": "Country time zones",
  "account.settings.section.social.media": "Social Media Links",
-  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your edX profile.",
+  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your {siteName} profile.",
  "account.settings.field.social.platform.name.linkedin": "LinkedIn",
  "account.settings.field.social.platform.name.linkedin.empty": "Add LinkedIn profile",
  "account.settings.jump.nav.delete.account": "Delete My Account",
@@ -101,17 +112,19 @@
  "account.settings.delete.account.before.proceeding": "Before proceeding, please {actionLink}.",
  "account.settings.delete.account.header": "Delete My Account",
  "account.settings.delete.account.subheader": "We're sorry to see you go!",
-  "account.settings.delete.account.text.1": "Please note: Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.",
-  "account.settings.delete.account.text.2": "Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
-  "account.settings.delete.account.text.3.link": "follow the instructions for printing or downloading a certificate",
-  "account.settings.delete.account.text.warning": "Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on edX.",
+  "account.settings.delete.account.text.1": "Please note: Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
+  "account.settings.delete.account.text.2": "Once your account is deleted, you cannot use it to take courses on {siteName}.",
+  "account.settings.delete.account.text.2.edX": "Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
+  "account.settings.delete.account.text.3.link": "Follow these instructions for printing or downloading a certificate",
+  "account.settings.delete.account.text.warning": "Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on {siteName}.",
  "account.settings.delete.account.text.change.instead": "Want to change your email, name, or password instead?",
  "account.settings.delete.account.button": "Delete My Account",
  "account.settings.delete.account.please.activate": "activate your account",
  "account.settings.delete.account.please.unlink": "unlink all social media accounts",
  "account.settings.delete.account.modal.header": "Are you sure?",
-  "account.settings.delete.account.modal.text.1": "You have selected \"Delete My Account\". Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.",
-  "account.settings.delete.account.modal.text.2": "If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
+  "account.settings.delete.account.modal.text.1": "You have selected \"Delete My Account\". Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
+  "account.settings.delete.account.modal.text.2": "If you proceed, you will be unable to use this account to take courses on {siteName}.",
+  "account.settings.delete.account.modal.text.2.edX": "If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
  "account.settings.delete.account.modal.enter.password": "If you still wish to continue and delete your account, please enter your account password:",
  "account.settings.delete.account.modal.confirm.delete": "Yes, Delete",
  "account.settings.delete.account.modal.confirm.cancel": "Cancel",
@@ -122,7 +135,8 @@
  "account.settings.delete.account.modal.after.header": "We're sorry to see you go!  Your account will be deleted shortly.",
  "account.settings.delete.account.modal.after.text": "Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.",
  "account.settings.delete.account.modal.after.button": "Close",
-  "account.settings.delete.account.text.3": "You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, {actionLink}.",
+  "account.settings.delete.account.text.3.edX": "You may also lose access to verified certificates and other program credentials like MicroMasters certificates. You can make a copy of these for your records before proceeding with deletion. {actionLink}.",
+  "account.settings.delete.account.text.3": "You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.",
  "account.settings.message.demographics.service.issue": "An error occurred attempting to retrieve or save your account information. Please try again later.",
  "account.settings.field.demographics.gender": "Gender identity",
  "account.settings.field.demographics.gender.empty": "Add gender identity",
@@ -153,7 +167,7 @@
  "account.settings.field.demographics.future_work_sector": "Future work industry",
  "account.settings.field.demographics.future_work_sector.empty": "Add work industry",
  "account.settings.field.demographics.work_sector.options.empty": "Select work industry",
-  "account.settings.section.demographics.why": "Why does edX collect this information?",
+  "account.settings.section.demographics.why": "Why does {siteName} collect this information?",
  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
  "account.settings.editable.field.password.reset.button.confirmation.support.link": "technical support",
  "account.settings.editable.field.password.reset.button.confirmation": "We've sent a message to {email}. Click the link in the message to reset your password. Didn't receive the message? Contact {technicalSupportLink}.",
@@ -168,6 +182,7 @@
  "id.verification.access.blocked.denied": "You cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}.",
  "id.verification.next": "Next",
  "id.verification.support": "support",
+  "id.verification.continue.upload": "Continue with Upload",
  "id.verification.example.card.alt": "Example of a valid identification card with a full name and photo.",
  "id.verification.requirements.title": "Photo Verification Requirements",
  "id.verification.requirements.description": "In order to complete Photo Verification online, you will need the following:",
@@ -176,10 +191,10 @@
  "id.verification.requirements.card.id.title": "Photo Identification",
  "id.verification.requirements.card.id.text": "You need a valid identification card that contains your full name and photo.",
  "id.verification.privacy.title": "Privacy Information",
-  "id.verification.privacy.need.photo.question": "Why does edX need my photo?",
+  "id.verification.privacy.need.photo.question": "Why does {siteName} need my photo?",
  "id.verification.privacy.need.photo.answer": "We use your verification photos to confirm your identity and ensure the validity of your certificate.",
-  "id.verification.privacy.do.with.photo.question": "What does edX do with this photo?",
-  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on edX after the verification process is complete.",
+  "id.verification.privacy.do.with.photo.question": "What does {siteName} do with this photo?",
+  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on {siteName} after the verification process is complete.",
  "id.verification.access.blocked.title": "Identity Verification",
  "id.verification.access.blocked.enrollment": "You are not currently enrolled in a course that requires identity verification.",
  "id.verification.access.blocked.pending": "You have already submitted your verification information. You will see a message on your dashboard when the verification process is complete (usually within 5 days).",
@@ -254,7 +269,7 @@
  "id.verification.camera.help.sight.answer.id": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally, the best position for a photo of an ID card is 8-12 inches (20-30 centimeters) from the camera, with the ID card centered relative to the camera. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle. The most common reason for rejection is inability to read the text on the ID card.",
  "id.verification.camera.help.difficulty.question.portrait": "What if I have difficulty holding my head in position relative to the camera?",
  "id.verification.camera.help.difficulty.question.id": "What if I have difficulty holding my ID in position relative to the camera?",
-  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact edX support for additional suggestions.",
+  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.",
  "id.verification.camera.help.upload.question": "What if I want to upload a photo instead?",
  "id.verification.camera.help.upload.answer": "On the next page you will have the option to switch to upload mode. By selecting that option, you will be able to upload a photo instead.",
  "id.verification.id.photo.unclear.question": "Is your ID image not clear or too blurry?",
@@ -293,7 +308,7 @@
  "id.verification.submission.alert.error.id": "A photo of your ID card is required. Please retake your ID photo.",
  "id.verification.submission.alert.error.name": "A valid account name is required. Please update your account name to match the name on your ID.",
  "id.verification.submission.alert.error.unsupported": "One or more of the files you have uploaded is in an unsupported format. Please choose from the following: ",
-  "id.verification.review.error": "edX Support Page",
+  "id.verification.review.error": "{siteName} Support Page",
  "id.verification.submitted.title": "Identity Verification in Progress",
  "id.verification.submitted.text": "We have received your information and are verifying your identity. You will see a message on your dashboard when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.",
  "id.verification.return.dashboard": "Return to Your Dashboard",
--- a/src/i18n/messages/zh_CN.json
+++ b/src/i18n/messages/zh_CN.json
@@ -1,5 +1,5 @@
 {
-  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another edX account.",
+  "account.settings.message.duplicate.tpa.provider": "The {provider} account you selected is already linked to another {siteName} account.",
  "account.settings.message.managed.settings": "Your profile settings are managed by {managerTitle}. Contact your administrator or {support} for help.",
  "account.settings.message.managed.settings.support": "support",
  "account.settings.page.heading": "Account Settings",
@@ -14,16 +14,27 @@
  "account.settings.section.demographics.information": "Optional Information",
  "account.settings.section.site.preferences": "Site Preferences",
  "account.settings.section.linked.accounts": "Linked Accounts",
-  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to edX.",
+  "account.settings.section.linked.accounts.description": "You can link your identity accounts to simplify signing in to {siteName}.",
  "account.settings.field.username": "Username",
-  "account.settings.field.username.help.text": "The name that identifies you on edX. You cannot change your username.",
+  "account.settings.field.username.help.text": "The name that identifies you on {siteName}. You cannot change your username.",
  "account.settings.field.full.name": "Full name",
  "account.settings.field.full.name.empty": "Add name",
  "account.settings.field.full.name.help.text": "The name that is used for ID verification and that appears on your certificates.",
+  "account.settings.field.name.verified": "Verified name",
+  "account.settings.field.name.verified.help.text.verified": "This name has been verified by government ID.",
+  "account.settings.field.name.verified.help.text.submitted": "Verification has been submitted. This usually takes 48 hours or less. Verified name cannot be changed at this time.",
+  "account.settings.field.full.name.help.text.submitted": "When identity verification is successful, this name will appear on your certificates and public-facing records. Full name cannot be changed at this time.",
+  "account.settings.field.name.verified.success.message": "Your identity verification request has successfully completed. You now have the option of selecting which name you prefer to appear on your certificates and public-records.",
+  "account.settings.field.name.verified.success.message.header": "Your name change request is complete!",
+  "account.settings.field.name.verified.failure.message": "Your Verified name change attempt, “{verifiedName}”, did not pass ID verification. Your previous Verified name settings have been restored.",
+  "account.settings.field.name.verified.failure.message.header": "We were not able to verify your identity.",
+  "account.settings.field.name.verified.failure.message.help.link": "Learn more about ID verification",
+  "account.settings.field.name.verified.submitted.message": "Your identity verification request has been submitted and usually takes between 24 and 48 hours to complete. When your request is approved, your updated name will appear on all associated certificates and public-facing records.",
+  "account.settings.field.name.verified.submitted.message.header": "Your name change request is almost complete!",
  "account.settings.field.email": "Email address (Sign in)",
  "account.settings.field.email.empty": "Add email address",
  "account.settings.field.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your email address.",
-  "account.settings.field.email.help.text": "You receive messages from edX and course teams at this address.",
+  "account.settings.field.email.help.text": "You receive messages from {siteName} and course teams at this address.",
  "account.settings.field.secondary.email": "Recovery email address",
  "account.settings.field.secondary.email.empty": "Add a recovery email address",
  "account.settings.field.secondary.email.confirmation": "We’ve sent a confirmation message to {value}. Click the link in the message to update your recovery email address.",
@@ -67,7 +78,7 @@
  "account.settings.field.time.zone.all": "All time zones",
  "account.settings.field.time.zone.country": "Country time zones",
  "account.settings.section.social.media": "Social Media Links",
-  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your edX profile.",
+  "account.settings.section.social.media.description": "Optionally, link your personal accounts to the social media icons on your {siteName} profile.",
  "account.settings.field.social.platform.name.linkedin": "LinkedIn",
  "account.settings.field.social.platform.name.linkedin.empty": "Add LinkedIn profile",
  "account.settings.jump.nav.delete.account": "Delete My Account",
@@ -101,17 +112,19 @@
  "account.settings.delete.account.before.proceeding": "Before proceeding, please {actionLink}.",
  "account.settings.delete.account.header": "Delete My Account",
  "account.settings.delete.account.subheader": "We're sorry to see you go!",
-  "account.settings.delete.account.text.1": "Please note: Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.",
-  "account.settings.delete.account.text.2": "Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
-  "account.settings.delete.account.text.3.link": "follow the instructions for printing or downloading a certificate",
-  "account.settings.delete.account.text.warning": "Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on edX.",
+  "account.settings.delete.account.text.1": "Please note: Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
+  "account.settings.delete.account.text.2": "Once your account is deleted, you cannot use it to take courses on {siteName}.",
+  "account.settings.delete.account.text.2.edX": "Once your account is deleted, you cannot use it to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer’s or university’s system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
+  "account.settings.delete.account.text.3.link": "Follow these instructions for printing or downloading a certificate",
+  "account.settings.delete.account.text.warning": "Warning: Account deletion is permanent. Please read the above carefully before proceeding. This is an irreversible action, and you will no longer be able to use the same email on {siteName}.",
  "account.settings.delete.account.text.change.instead": "Want to change your email, name, or password instead?",
  "account.settings.delete.account.button": "Delete My Account",
  "account.settings.delete.account.please.activate": "activate your account",
  "account.settings.delete.account.please.unlink": "unlink all social media accounts",
  "account.settings.delete.account.modal.header": "Are you sure?",
-  "account.settings.delete.account.modal.text.1": "You have selected \"Delete My Account\". Deletion of your account and personal data is permanent and cannot be undone. edX will not be able to recover your account or the data that is deleted.",
-  "account.settings.delete.account.modal.text.2": "If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
+  "account.settings.delete.account.modal.text.1": "You have selected \"Delete My Account\". Deletion of your account and personal data is permanent and cannot be undone. {siteName} will not be able to recover your account or the data that is deleted.",
+  "account.settings.delete.account.modal.text.2": "If you proceed, you will be unable to use this account to take courses on {siteName}.",
+  "account.settings.delete.account.modal.text.2.edX": "If you proceed, you will be unable to use this account to take courses on the edX app, edx.org, or any other site hosted by edX. This includes access to edx.org from your employer's or university's system and access to private sites offered by MIT Open Learning, Wharton Executive Education, and Harvard Medical School.",
  "account.settings.delete.account.modal.enter.password": "If you still wish to continue and delete your account, please enter your account password:",
  "account.settings.delete.account.modal.confirm.delete": "Yes, Delete",
  "account.settings.delete.account.modal.confirm.cancel": "Cancel",
@@ -122,7 +135,8 @@
  "account.settings.delete.account.modal.after.header": "We're sorry to see you go!  Your account will be deleted shortly.",
  "account.settings.delete.account.modal.after.text": "Account deletion, including removal from email lists, may take a few weeks to fully process through our system. If you want to opt-out of emails before then, please unsubscribe from the footer of any email.",
  "account.settings.delete.account.modal.after.button": "Close",
-  "account.settings.delete.account.text.3": "You may also lose access to verified certificates and other program credentials like MicroMasters certificates. If you want to make a copy of these for your records before proceeding with deletion, {actionLink}.",
+  "account.settings.delete.account.text.3.edX": "You may also lose access to verified certificates and other program credentials like MicroMasters certificates. You can make a copy of these for your records before proceeding with deletion. {actionLink}.",
+  "account.settings.delete.account.text.3": "You may also lose access to verified certificates and other program credentials. You can make a copy of these for your records before proceeding with deletion.",
  "account.settings.message.demographics.service.issue": "An error occurred attempting to retrieve or save your account information. Please try again later.",
  "account.settings.field.demographics.gender": "Gender identity",
  "account.settings.field.demographics.gender.empty": "Add gender identity",
@@ -153,7 +167,7 @@
  "account.settings.field.demographics.future_work_sector": "Future work industry",
  "account.settings.field.demographics.future_work_sector.empty": "Add work industry",
  "account.settings.field.demographics.work_sector.options.empty": "Select work industry",
-  "account.settings.section.demographics.why": "Why does edX collect this information?",
+  "account.settings.section.demographics.why": "Why does {siteName} collect this information?",
  "error.notfound.message": "The page you're looking for is unavailable or there's an error in the URL. Please check the URL and try again.",
  "account.settings.editable.field.password.reset.button.confirmation.support.link": "technical support",
  "account.settings.editable.field.password.reset.button.confirmation": "We've sent a message to {email}. Click the link in the message to reset your password. Didn't receive the message? Contact {technicalSupportLink}.",
@@ -168,6 +182,7 @@
  "id.verification.access.blocked.denied": "You cannot verify your identity at this time. If you have yet to activate your account, please check your spam folder for the activation email from {email}.",
  "id.verification.next": "Next",
  "id.verification.support": "support",
+  "id.verification.continue.upload": "Continue with Upload",
  "id.verification.example.card.alt": "Example of a valid identification card with a full name and photo.",
  "id.verification.requirements.title": "Photo Verification Requirements",
  "id.verification.requirements.description": "In order to complete Photo Verification online, you will need the following:",
@@ -176,10 +191,10 @@
  "id.verification.requirements.card.id.title": "Photo Identification",
  "id.verification.requirements.card.id.text": "You need a valid identification card that contains your full name and photo.",
  "id.verification.privacy.title": "Privacy Information",
-  "id.verification.privacy.need.photo.question": "Why does edX need my photo?",
+  "id.verification.privacy.need.photo.question": "Why does {siteName} need my photo?",
  "id.verification.privacy.need.photo.answer": "We use your verification photos to confirm your identity and ensure the validity of your certificate.",
-  "id.verification.privacy.do.with.photo.question": "What does edX do with this photo?",
-  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on edX after the verification process is complete.",
+  "id.verification.privacy.do.with.photo.question": "What does {siteName} do with this photo?",
+  "id.verification.privacy.do.with.photo.answer": "We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on {siteName} after the verification process is complete.",
  "id.verification.access.blocked.title": "Identity Verification",
  "id.verification.access.blocked.enrollment": "You are not currently enrolled in a course that requires identity verification.",
  "id.verification.access.blocked.pending": "You have already submitted your verification information. You will see a message on your dashboard when the verification process is complete (usually within 5 days).",
@@ -254,7 +269,7 @@
  "id.verification.camera.help.sight.answer.id": "You may be able to complete the image capture procedure without assistance, but it may take a couple of submission attempts to get the camera positioning right. Optimal camera positioning varies with each computer, but generally, the best position for a photo of an ID card is 8-12 inches (20-30 centimeters) from the camera, with the ID card centered relative to the camera. If the photos you submit are rejected, try moving the computer or camera orientation to change the lighting angle. The most common reason for rejection is inability to read the text on the ID card.",
  "id.verification.camera.help.difficulty.question.portrait": "What if I have difficulty holding my head in position relative to the camera?",
  "id.verification.camera.help.difficulty.question.id": "What if I have difficulty holding my ID in position relative to the camera?",
-  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact edX support for additional suggestions.",
+  "id.verification.camera.help.difficulty.answer": "If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.",
  "id.verification.camera.help.upload.question": "What if I want to upload a photo instead?",
  "id.verification.camera.help.upload.answer": "On the next page you will have the option to switch to upload mode. By selecting that option, you will be able to upload a photo instead.",
  "id.verification.id.photo.unclear.question": "Is your ID image not clear or too blurry?",
@@ -293,7 +308,7 @@
  "id.verification.submission.alert.error.id": "A photo of your ID card is required. Please retake your ID photo.",
  "id.verification.submission.alert.error.name": "A valid account name is required. Please update your account name to match the name on your ID.",
  "id.verification.submission.alert.error.unsupported": "One or more of the files you have uploaded is in an unsupported format. Please choose from the following: ",
-  "id.verification.review.error": "edX Support Page",
+  "id.verification.review.error": "{siteName} Support Page",
  "id.verification.submitted.title": "Identity Verification in Progress",
  "id.verification.submitted.text": "We have received your information and are verifying your identity. You will see a message on your dashboard when the verification process is complete (usually within 5 days). In the meantime, you can still access all available course content.",
  "id.verification.return.dashboard": "Return to Your Dashboard",
--- a/src/id-verification/Camera.jsx
+++ b/src/id-verification/Camera.jsx
@@ -262,6 +262,7 @@ class Camera extends React.Component {
    const dataUri = this.cameraPhoto.getDataUri(config);
    this.setState({ dataUri });
    this.props.onImageCapture(dataUri);
+    this.props.setPhotoMode('camera');
  }

  playShutterClick() {
@@ -359,6 +360,7 @@ class Camera extends React.Component {
 Camera.propTypes = {
  intl: intlShape.isRequired,
  onImageCapture: PropTypes.func.isRequired,
+  setPhotoMode: PropTypes.func.isRequired,
  isPortrait: PropTypes.bool.isRequired,
 };

--- a/src/id-verification/CameraHelp.jsx
+++ b/src/id-verification/CameraHelp.jsx
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { Collapsible } from '@edx/paragon';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';

+import { getConfig } from '@edx/frontend-platform';
 import messages from './IdVerification.messages';
 import IdVerificationContext from './IdVerificationContext';

@@ -41,7 +42,10 @@ function CameraHelp(props) {
        defaultOpen={props.isOpen}
      >
        <p>
-          {props.intl.formatMessage(messages['id.verification.camera.help.difficulty.answer'])}
+          {props.intl.formatMessage(
+            messages['id.verification.camera.help.difficulty.answer'],
+            { siteName: getConfig().SITE_NAME },
+          )}
        </p>
      </Collapsible>
    </div>
--- a/src/id-verification/CollapsibleImageHelp.jsx
+++ b/src/id-verification/CollapsibleImageHelp.jsx
@@ -1,4 +1,5 @@
 import React, { useContext } from 'react';
+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Button, Collapsible } from '@edx/paragon';
 import { Link } from 'react-router-dom';
@@ -9,10 +10,16 @@ import messages from './IdVerification.messages';

 function CollapsibleImageHelp(props) {
  const {
-    shouldUseCamera, setShouldUseCamera, optimizelyExperimentName, mediaAccess,
+    userId, shouldUseCamera, setShouldUseCamera, optimizelyExperimentName, mediaAccess,
  } = useContext(IdVerificationContext);

  function handleClick() {
+    const toggleTo = shouldUseCamera ? 'upload' : 'camera';
+    const eventName = `edx.id_verification.toggle_to.${toggleTo}`;
+    sendTrackEvent(eventName, {
+      category: 'id_verification',
+      user_id: userId,
+    });
    setShouldUseCamera(!shouldUseCamera);
  }

--- a/src/id-verification/IdVerification.messages.js
+++ b/src/id-verification/IdVerification.messages.js
@@ -58,23 +58,23 @@ const messages = defineMessages({
  },
  'id.verification.privacy.need.photo.question': {
    id: 'id.verification.privacy.need.photo.question',
-    defaultMessage: 'Why does edX need my photo?',
-    description: 'Question about why edX needs a verification photo.',
+    defaultMessage: 'Why does {siteName} need my photo?',
+    description: 'Question about why the platform needs a verification photo.',
  },
  'id.verification.privacy.need.photo.answer': {
    id: 'id.verification.privacy.need.photo.answer',
    defaultMessage: 'We use your verification photos to confirm your identity and ensure the validity of your certificate.',
-    description: 'Answering why edX needs a verification photo.',
+    description: 'Answering why the platform needs a verification photo.',
  },
  'id.verification.privacy.do.with.photo.question': {
    id: 'id.verification.privacy.do.with.photo.question',
-    defaultMessage: 'What does edX do with this photo?',
-    description: 'Question about what edX does with the verification photo.',
+    defaultMessage: 'What does {siteName} do with this photo?',
+    description: 'Question about what the platform does with the verification photo.',
  },
  'id.verification.privacy.do.with.photo.answer': {
    id: 'id.verification.privacy.do.with.photo.answer',
-    defaultMessage: 'We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on edX after the verification process is complete.',
-    description: 'Answering what edX does with the verification photo.',
+    defaultMessage: 'We securely encrypt your photo and send it our authorization service for review. Your photo and information are not saved or visible anywhere on {siteName} after the verification process is complete.',
+    description: 'Answering what the platform does with the verification photo.',
  },
  'id.verification.access.blocked.title': {
    id: 'id.verification.access.blocked.title',
@@ -448,7 +448,7 @@ const messages = defineMessages({
  },
  'id.verification.camera.help.difficulty.answer': {
    id: 'id.verification.camera.help.difficulty.answer',
-    defaultMessage: 'If you require assistance with taking a photo for submission, contact edX support for additional suggestions.',
+    defaultMessage: 'If you require assistance with taking a photo for submission, contact {siteName} support for additional suggestions.',
    description: 'Confirming what to do if the user has difficult holding their head relative to the camera.',
  },
  'id.verification.camera.help.upload.question': {
@@ -643,8 +643,8 @@ const messages = defineMessages({
  },
  'id.verification.review.error': {
    id: 'id.verification.review.error',
-    defaultMessage: 'edX Support Page',
-    description: 'Text linking to the support page.',
+    defaultMessage: '{siteName} Support Page',
+    description: 'Text linking to the platform support page.',
  },
  'id.verification.submitted.title': {
    id: 'id.verification.submitted.title',
--- a/src/id-verification/IdVerificationContextProvider.jsx
+++ b/src/id-verification/IdVerificationContextProvider.jsx
@@ -2,7 +2,7 @@ import React, { useState, useContext, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { AppContext } from '@edx/frontend-platform/react';

-import { getProfileDataManager } from '../account-settings/data/service';
+import { getProfileDataManager, getVerifiedName } from '../account-settings/data/service';
 import PageLoading from '../account-settings/PageLoading';

 import { getExistingIdVerification, getEnrollments } from './data/service';
@@ -76,9 +76,26 @@ export default function IdVerificationContextProvider({ children }) {
    }
  }, [authenticatedUser]);

+  const [verifiedName, setVerifiedName] = useState('');
+  useEffect(() => {
+    // Make the API call to retrieve VerifiedName of the learner.
+    // If the learner do not have such attribute from their account, that's OK.
+    // If the learner do have the attribute, the VerifiedName is overriding authenticatedUser.name
+    (async () => {
+      const verifiedNameResponse = await getVerifiedName();
+      if (verifiedNameResponse) {
+        setVerifiedName(verifiedNameResponse.verified_name);
+      }
+    })();
+  }, []);
+
  const [optimizelyExperimentName, setOptimizelyExperimentName] = useState('');
  const [shouldUseCamera, setShouldUseCamera] = useState(false);

+  // The following are used to keep track of how a user has submitted photos
+  const [portraitPhotoMode, setPortraitPhotoMode] = useState('');
+  const [idPhotoMode, setIdPhotoMode] = useState('');
+
  // If the user reaches the end of the flow and goes back to retake their photos,
  // this flag ensures that they are directed straight back to the summary panel
  const [reachedSummary, setReachedSummary] = useState(false);
@@ -91,10 +108,12 @@ export default function IdVerificationContextProvider({ children }) {
    mediaStream,
    mediaAccess,
    userId: authenticatedUser.userId,
-    nameOnAccount: authenticatedUser.name,
+    nameOnAccount: verifiedName || authenticatedUser.name,
    profileDataManager,
    optimizelyExperimentName,
    shouldUseCamera,
+    portraitPhotoMode,
+    idPhotoMode,
    reachedSummary,
    setExistingIdVerification,
    setFacePhotoFile,
@@ -102,6 +121,8 @@ export default function IdVerificationContextProvider({ children }) {
    setIdPhotoName,
    setOptimizelyExperimentName,
    setShouldUseCamera,
+    setPortraitPhotoMode,
+    setIdPhotoMode,
    setReachedSummary,
    tryGetUserMedia: async () => {
      try {
--- a/src/id-verification/IdVerificationPage.jsx
+++ b/src/id-verification/IdVerificationPage.jsx
@@ -6,6 +6,7 @@ import {
 import qs from 'qs';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Modal, Button } from '@edx/paragon';
+import { getConfig } from '@edx/frontend-platform';
 import { idVerificationSelector } from './data/selectors';
 import './getUserMediaShim';

@@ -77,10 +78,25 @@ function IdVerificationPage(props) {
          title={props.intl.formatMessage(messages['id.verification.privacy.title'])}
          body={(
            <div>
-              <h6>{props.intl.formatMessage(messages['id.verification.privacy.need.photo.question'])}</h6>
+              <h6>
+                {props.intl.formatMessage(
+                  messages['id.verification.privacy.need.photo.question'],
+                  { siteName: getConfig().SITE_NAME },
+                )}
+              </h6>
              <p>{props.intl.formatMessage(messages['id.verification.privacy.need.photo.answer'])}</p>
-              <h6>{props.intl.formatMessage(messages['id.verification.privacy.do.with.photo.question'])}</h6>
-              <p>{props.intl.formatMessage(messages['id.verification.privacy.do.with.photo.answer'])}</p>
+              <h6>
+                {props.intl.formatMessage(
+                  messages['id.verification.privacy.do.with.photo.question'],
+                  { siteName: getConfig().SITE_NAME },
+                )}
+              </h6>
+              <p>
+                {props.intl.formatMessage(
+                  messages['id.verification.privacy.do.with.photo.answer'],
+                  { siteName: getConfig().SITE_NAME },
+                )}
+              </p>
            </div>
          )}
          onClose={() => setIsModalOpen(false)}
--- a/src/id-verification/ImageFileUpload.jsx
+++ b/src/id-verification/ImageFileUpload.jsx
@@ -5,7 +5,7 @@ import { Alert } from '@edx/paragon';
 import messages from './IdVerification.messages';
 import SupportedMediaTypes from './SupportedMediaTypes';

-export default function ImageFileUpload({ onFileChange, intl }) {
+export default function ImageFileUpload({ onFileChange, setPhotoMode, intl }) {
  const [error, setError] = useState(null);
  const errorTypes = {
    invalidFileType: 'invalidFileType',
@@ -26,7 +26,10 @@ export default function ImageFileUpload({ onFileChange, intl }) {
    } else {
      setError(null);
      const fileReader = new FileReader();
-      fileReader.addEventListener('load', () => onFileChange(fileReader.result));
+      fileReader.addEventListener('load', () => {
+        onFileChange(fileReader.result);
+        setPhotoMode('upload');
+      });
      fileReader.readAsDataURL(fileObject);
    }
  }, []);
@@ -56,5 +59,6 @@ export default function ImageFileUpload({ onFileChange, intl }) {

 ImageFileUpload.propTypes = {
  onFileChange: PropTypes.func.isRequired,
+  setPhotoMode: PropTypes.func.isRequired,
  intl: intlShape.isRequired,
 };
--- a/src/id-verification/data/service.js
+++ b/src/id-verification/data/service.js
@@ -65,6 +65,8 @@ export async function submitIdVerification(verificationData) {
    idPhotoFile: 'photo_id_image',
    idPhotoName: 'full_name',
    optimizelyExperimentName: 'experiment_name',
+    portraitPhotoMode: 'portrait_photo_mode',
+    idPhotoMode: 'id_photo_mode',
  };
  const postData = {};
  // Don't include blank/null/undefined values.
--- a/src/id-verification/panels/ChooseModePanel.jsx
+++ b/src/id-verification/panels/ChooseModePanel.jsx
@@ -1,5 +1,6 @@
 import React, { useContext } from 'react';
 import { Link } from 'react-router-dom';
+import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { Form } from '@edx/paragon';

@@ -10,10 +11,16 @@ import messages from '../IdVerification.messages';

 function ChooseModePanel(props) {
  const panelSlug = 'choose-mode';
-  const { shouldUseCamera, setShouldUseCamera } = useContext(IdVerificationContext);
+  const { userId, shouldUseCamera, setShouldUseCamera } = useContext(IdVerificationContext);

  function onPhotoModeChange(value) {
    setShouldUseCamera(value);
+    const mode = value ? 'camera' : 'upload';
+    const eventName = `edx.id_verification.choose.${mode}`;
+    sendTrackEvent(eventName, {
+      category: 'id_verification',
+      user_id: userId,
+    });
  }

  return (
--- a/src/id-verification/panels/GetNameIdPanel.jsx
+++ b/src/id-verification/panels/GetNameIdPanel.jsx
@@ -146,9 +146,15 @@ function GetNameIdPanel(props) {
            onChange={e => setIdPhotoName(e.target.value)}
            data-testid="name-input"
          />
-          <Form.Control.Feedback id="photo-id-name-feedback" type="invalid">
-            {getErrorMessage()}
-          </Form.Control.Feedback>
+          {(invalidName || profileDataManager) && (
+            <Form.Control.Feedback
+              id="photo-id-name-feedback"
+              data-testid="id-name-feedback-message"
+              type="invalid"
+            >
+              {getErrorMessage()}
+            </Form.Control.Feedback>
+          )}
        </Form.Group>
      </Form>

--- a/src/id-verification/panels/ReviewRequirementsPanel.jsx
+++ b/src/id-verification/panels/ReviewRequirementsPanel.jsx
@@ -112,16 +112,25 @@ function ReviewRequirementsPanel(props) {
        {props.intl.formatMessage(messages['id.verification.privacy.title'])}
      </h4>
      <h6 aria-level="3">
-        {props.intl.formatMessage(messages['id.verification.privacy.need.photo.question'])}
+        {props.intl.formatMessage(
+          messages['id.verification.privacy.need.photo.question'],
+          { siteName: getConfig().SITE_NAME },
+        )}
      </h6>
      <p>
        {props.intl.formatMessage(messages['id.verification.privacy.need.photo.answer'])}
      </p>
      <h6 aria-level="3">
-        {props.intl.formatMessage(messages['id.verification.privacy.do.with.photo.question'])}
+        {props.intl.formatMessage(
+          messages['id.verification.privacy.do.with.photo.question'],
+          { siteName: getConfig().SITE_NAME },
+        )}
      </h6>
      <p>
-        {props.intl.formatMessage(messages['id.verification.privacy.do.with.photo.answer'])}
+        {props.intl.formatMessage(
+          messages['id.verification.privacy.do.with.photo.answer'],
+          { siteName: getConfig().SITE_NAME },
+        )}
      </p>

      <div className="action-row">
--- a/src/id-verification/panels/SummaryPanel.jsx
+++ b/src/id-verification/panels/SummaryPanel.jsx
@@ -28,6 +28,8 @@ function SummaryPanel(props) {
    stopUserMedia,
    optimizelyExperimentName,
    setReachedSummary,
+    portraitPhotoMode,
+    idPhotoMode,
  } = useContext(IdVerificationContext);
  const nameToBeUsed = idPhotoName || nameOnAccount || '';
  const [isSubmitting, setIsSubmitting] = useState(false);
@@ -73,6 +75,8 @@ function SummaryPanel(props) {
      }
      if (optimizelyExperimentName) {
        verificationData.optimizelyExperimentName = optimizelyExperimentName;
+        verificationData.portraitPhotoMode = portraitPhotoMode;
+        verificationData.idPhotoMode = idPhotoMode;
      }
      const result = await submitIdVerification(verificationData);
      if (result.success) {
@@ -124,7 +128,16 @@ function SummaryPanel(props) {
          This might be a temporary issue, so please try again in a few minutes.
          If the problem persists, please go to {support_link} for help.
        `}
-        values={{ support_link: <Alert.Link href="https://support.edx.org/hc/en-us">{props.intl.formatMessage(messages['id.verification.review.error'])}</Alert.Link> }}
+        values={{
+          support_link: (
+            <Alert.Link href="https://support.edx.org/hc/en-us">
+              {props.intl.formatMessage(
+                messages['id.verification.review.error'],
+                { siteName: getConfig().SITE_NAME },
+              )}
+            </Alert.Link>
+          ),
+        }}
      />
    );
  }
--- a/src/id-verification/panels/TakeIdPhotoPanel.jsx
+++ b/src/id-verification/panels/TakeIdPhotoPanel.jsx
@@ -18,7 +18,7 @@ function TakeIdPhotoPanel(props) {
  const panelSlug = 'take-id-photo';
  const nextPanelSlug = useNextPanelSlug(panelSlug);
  const {
-    setIdPhotoFile, idPhotoFile, optimizelyExperimentName, shouldUseCamera,
+    setIdPhotoFile, idPhotoFile, optimizelyExperimentName, shouldUseCamera, setIdPhotoMode,
  } = useContext(IdVerificationContext);

  return (
@@ -34,7 +34,7 @@ function TakeIdPhotoPanel(props) {
            <p>
              {props.intl.formatMessage(messages['id.verification.id.photo.instructions.camera'])}
            </p>
-            <Camera onImageCapture={setIdPhotoFile} isPortrait={false} />
+            <Camera onImageCapture={setIdPhotoFile} setPhotoMode={setIdPhotoMode} isPortrait={false} />
          </div>
        ) : (
          <div style={{ marginBottom: '1.25rem' }}>
@@ -42,7 +42,7 @@ function TakeIdPhotoPanel(props) {
              {props.intl.formatMessage(messages['id.verification.id.photo.instructions.upload'])}
              <SupportedMediaTypes />
            </p>
-            <ImageFileUpload onFileChange={setIdPhotoFile} intl={props.intl} />
+            <ImageFileUpload onFileChange={setIdPhotoFile} setPhotoMode={setIdPhotoMode} intl={props.intl} />
          </div>
        )}
      </div>
--- a/src/id-verification/panels/TakePortraitPhotoPanel.jsx
+++ b/src/id-verification/panels/TakePortraitPhotoPanel.jsx
@@ -18,7 +18,7 @@ function TakePortraitPhotoPanel(props) {
  const panelSlug = 'take-portrait-photo';
  const nextPanelSlug = useNextPanelSlug(panelSlug);
  const {
-    setFacePhotoFile, facePhotoFile, shouldUseCamera, optimizelyExperimentName,
+    setFacePhotoFile, facePhotoFile, shouldUseCamera, optimizelyExperimentName, setPortraitPhotoMode,
  } = useContext(IdVerificationContext);

  return (
@@ -34,7 +34,7 @@ function TakePortraitPhotoPanel(props) {
            <p>
              {props.intl.formatMessage(messages['id.verification.portrait.photo.instructions.camera'])}
            </p>
-            <Camera onImageCapture={setFacePhotoFile} isPortrait />
+            <Camera onImageCapture={setFacePhotoFile} setPhotoMode={setPortraitPhotoMode} isPortrait />
          </div>
        ) : (
          <div style={{ marginBottom: '1.25rem' }}>
@@ -42,7 +42,7 @@ function TakePortraitPhotoPanel(props) {
              {props.intl.formatMessage(messages['id.verification.portrait.photo.instructions.upload'])}
              <SupportedMediaTypes />
            </p>
-            <ImageFileUpload onFileChange={setFacePhotoFile} intl={props.intl} />
+            <ImageFileUpload onFileChange={setFacePhotoFile} setPhotoMode={setPortraitPhotoMode} intl={props.intl} />
          </div>
        )}
      </div>
--- a/src/id-verification/tests/Camera.test.jsx
+++ b/src/id-verification/tests/Camera.test.jsx
@@ -28,6 +28,7 @@ describe('SubmittedPanel', () => {
  const defaultProps = {
    intl: {},
    onImageCapture: jest.fn(),
+    setPhotoMode: jest.fn(),
    isPortrait: true,
  };

@@ -57,6 +58,7 @@ describe('SubmittedPanel', () => {
    expect(button).toHaveTextContent('Take Photo');
    fireEvent.click(button);
    expect(defaultProps.onImageCapture).toHaveBeenCalled();
+    expect(defaultProps.setPhotoMode).toHaveBeenCalledWith('camera');
  });

  it('shows correct help text for portrait photo capture', async () => {
--- a/src/id-verification/tests/IdVerificationContextProvider.test.jsx
+++ b/src/id-verification/tests/IdVerificationContextProvider.test.jsx
@@ -5,13 +5,14 @@ import '@testing-library/jest-dom/extend-expect';
 import { IntlProvider } from '@edx/frontend-platform/i18n';
 import { AppContext } from '@edx/frontend-platform/react';

-import { getProfileDataManager } from '../../account-settings/data/service';
+import { getProfileDataManager, getVerifiedName } from '../../account-settings/data/service';

 import { getExistingIdVerification, getEnrollments } from '../data/service';
 import IdVerificationContextProvider from '../IdVerificationContextProvider';

 jest.mock('../../account-settings/data/service', () => ({
  getProfileDataManager: jest.fn(),
+  getVerifiedName: jest.fn(),
 }));

 jest.mock('../data/service', () => ({
@@ -62,4 +63,16 @@ describe('IdVerificationContextProvider', () => {
      context.authenticatedUser.roles,
    );
  });
+
+  it('calls getVerifiedName', async () => {
+    const context = { authenticatedUser: { userId: 3, roles: [] } };
+    await act(async () => render((
+      <AppContext.Provider value={context}>
+        <IntlProvider locale="en">
+          <IdVerificationContextProvider {...defaultProps} />
+        </IntlProvider>
+      </AppContext.Provider>
+    )));
+    expect(getVerifiedName).toHaveBeenCalled();
+  });
 });
--- a/src/id-verification/tests/panels/GetNameIdPanel.test.jsx
+++ b/src/id-verification/tests/panels/GetNameIdPanel.test.jsx
@@ -54,8 +54,10 @@ describe('GetNameIdPanel', () => {
    const noButton = await screen.findByTestId('name-matches-no');
    const input = await screen.findByTestId('name-input');
    const nextButton = await screen.findByTestId('next-button');
+    const errorMessageQuery = await screen.queryByTestId('id-name-feedback-message');

    expect(input).toHaveProperty('readOnly');
+    expect(errorMessageQuery).toBeNull();

    fireEvent.click(noButton);
    expect(input).toHaveProperty('readOnly', false);
@@ -63,6 +65,8 @@ describe('GetNameIdPanel', () => {

    fireEvent.change(input, { target: { value: 'test change' } });
    expect(contextValue.setIdPhotoName).toHaveBeenCalled();
+    // Ensure the feedback message on name shows when the user says the name does not match ID
+    expect(await screen.queryByTestId('id-name-feedback-message')).toBeTruthy();

    fireEvent.click(yesButton);
    expect(input).toHaveProperty('readOnly');
@@ -77,11 +81,13 @@ describe('GetNameIdPanel', () => {
    const noButton = await screen.findByTestId('name-matches-no');
    const input = await screen.findByTestId('name-input');
    const nextButton = await screen.findByTestId('next-button');
+    const errorMessageQuery = await screen.queryByTestId('id-name-feedback-message');

    expect(yesButton).toHaveProperty('disabled');
    expect(noButton).toHaveProperty('disabled');
    expect(input).toHaveProperty('readOnly', false);
    expect(nextButton.classList.contains('disabled')).toBe(true);
+    expect(errorMessageQuery).toBeTruthy();
  });

  it('blocks the user from changing account name if managed by a third party', async () => {
--- a/src/id-verification/tests/panels/SummaryPanel.test.jsx
+++ b/src/id-verification/tests/panels/SummaryPanel.test.jsx
@@ -33,6 +33,8 @@ describe('SummaryPanel', () => {
    nameOnAccount: 'test name',
    idPhotoName: 'test name',
    optimizelyExperimentName: 'test-experiment',
+    portraitPhotoMode: 'camera',
+    idPhotoMode: 'upload',
    stopUserMedia: jest.fn(),
    setReachedSummary: jest.fn(),
  };
@@ -92,6 +94,8 @@ describe('SummaryPanel', () => {
      idPhotoFile: contextValue.idPhotoFile,
      idPhotoName: contextValue.idPhotoName,
      optimizelyExperimentName: contextValue.optimizelyExperimentName,
+      portraitPhotoMode: contextValue.portraitPhotoMode,
+      idPhotoMode: contextValue.idPhotoMode,
      courseRunKey: null,
    };
    await getPanel();
@@ -106,6 +110,8 @@ describe('SummaryPanel', () => {
    const verificationData = {
      facePhotoFile: contextValue.facePhotoFile,
      idPhotoFile: contextValue.idPhotoFile,
+      portraitPhotoMode: contextValue.portraitPhotoMode,
+      idPhotoMode: contextValue.idPhotoMode,
      optimizelyExperimentName: contextValue.optimizelyExperimentName,
      courseRunKey: null,
    };
@@ -120,6 +126,8 @@ describe('SummaryPanel', () => {
    const verificationData = {
      facePhotoFile: contextValue.facePhotoFile,
      idPhotoFile: contextValue.idPhotoFile,
+      portraitPhotoMode: contextValue.portraitPhotoMode,
+      idPhotoMode: contextValue.idPhotoMode,
      optimizelyExperimentName: contextValue.optimizelyExperimentName,
      courseRunKey: null,
    };