diff --git a/docs/en_us/course_authors/source/discussions.rst b/docs/en_us/course_authors/source/discussions.rst
index 107edccfa5..77dc4252a7 100644
--- a/docs/en_us/course_authors/source/discussions.rst
+++ b/docs/en_us/course_authors/source/discussions.rst
@@ -100,11 +100,11 @@ Assign discussion administration roles
 
 You can designate a team of people to help you run course discussions. Different options for working with discussion posts are available to discussion administrators with these roles:
 
-* Forum moderators can edit and delete posts, review posts flagged for misuse, close and reopen threads, pin posts and endorse responses, and, if the course is cohorted, see posts from all cohorts. Responses and comments made by moderators are marked as "Staff".
+* Discussion moderators can edit and delete posts, review posts flagged for misuse, close and reopen threads, pin posts and endorse responses, and, if the course is cohorted, see posts from all cohorts. Responses and comments made by moderators are marked as "Staff".
 
-* Forum community TAs have the same options for working with discussions as moderators. Responses and comments made by community TAs are marked as "Community TA".
+* Discussion community TAs have the same options for working with discussions as moderators. Responses and comments made by community TAs are marked as "Community TA".
 
-* Forum admins have the same options for working with discussions as moderators. Admins can also assign these discussion management roles to more people while your course is running, or remove a role from a user whenever necessary. Responses and comments made by admins are marked as "Staff".
+* Discussion admins have the same options for working with discussions as moderators. Admins can also assign these discussion management roles to more people while your course is running, or remove a role from a user whenever necessary. Responses and comments made by admins are marked as "Staff".
 
 **Note**: Discussion responses and comments made by course staff and instructors are also marked as "Staff".
 
@@ -123,7 +123,7 @@ To assign a role:
 
 #. Click **Membership**.
 
-#. In the Administration List Management section, use the drop-down list to select Forum Admins, Forum Moderators, or Forum Community TAs.
+#. In the Administration List Management section, use the drop-down list to select Discussion Admins, Discussion Moderators, or Discussion Community TAs.
 
 #. Under the list of users who currently have that role, enter an email address and click **Add** for the role type.
 
diff --git a/lms/templates/instructor/instructor_dashboard_2/membership.html b/lms/templates/instructor/instructor_dashboard_2/membership.html
index 6e15f38dca..dcf658ca01 100644
--- a/lms/templates/instructor/instructor_dashboard_2/membership.html
+++ b/lms/templates/instructor/instructor_dashboard_2/membership.html
@@ -71,7 +71,7 @@
     <p>
       ${_("Staff cannot modify staff or beta tester lists. To modify these lists, "
       "contact your instructor and ask them to add you as an instructor for staff "
-      "and beta lists, or a forum admin for forum management.")}
+      "and beta lists, or a discussion admin for discussion management.")}
     </p>
   %endif
 
@@ -94,7 +94,7 @@
       data-display-name="${_("Instructors")}"
       data-info-text="
         ${_("Instructors are the core administration of your course. Instructors can "
-        "add and remove course staff, as well as administer forum access.")}"
+        "add and remove course staff, as well as administer discussion access.")}"
       data-list-endpoint="${ section_data['list_course_role_members_url'] }"
       data-modify-endpoint="${ section_data['modify_access_url'] }"
       data-add-button-label="${_("Add Instructor")}"
@@ -114,23 +114,23 @@
 
     <div class="auth-list-container"
       data-rolename="Administrator"
-      data-display-name="${_("Forum Admins")}"
+      data-display-name="${_("Discussion Admins")}"
       data-info-text="
-        ${_("Forum admins can edit or delete any post, clear misuse flags, close "
+        ${_("Discussion admins can edit or delete any post, clear misuse flags, close "
          "and re-open threads, endorse responses, and see posts from all cohorts. "
          "They CAN add/delete other moderators and their posts are marked as 'staff'.")}"
       data-list-endpoint="${ section_data['list_forum_members_url'] }"
       data-modify-endpoint="${ section_data['update_forum_role_membership_url'] }"
-      data-add-button-label="Add ${_("Forum Admin")}"
+      data-add-button-label="Add ${_("Discussion Admin")}"
     ></div>
   %endif
 
   %if section_data['access']['instructor'] or section_data['access']['forum_admin']:
     <div class="auth-list-container"
       data-rolename="Moderator"
-      data-display-name="${_("Forum Moderators")}"
+      data-display-name="${_("Discussion Moderators")}"
       data-info-text="
-        ${_("Forum moderators can edit or delete any post, clear misuse flags, close "
+        ${_("Discussion moderators can edit or delete any post, clear misuse flags, close "
          "and re-open threads, endorse responses, and see posts from all cohorts. "
          "They CANNOT add/delete other moderators and their posts are marked as 'staff'.")}"
       data-list-endpoint="${ section_data['list_forum_members_url'] }"
@@ -140,10 +140,10 @@
 
     <div class="auth-list-container"
       data-rolename="Community TA"
-      data-display-name="${_("Forum Community TAs")}"
+      data-display-name="${_("Discussion Community TAs")}"
       data-info-text="
         ${_("Community TA's are members of the community whom you deem particularly "
-        "helpful on the forums. They can edit or delete any post, clear misuse flags, "
+        "helpful on the discussion boards. They can edit or delete any post, clear misuse flags, "
         "close and re-open threads, endorse responses, and see posts from all cohorts. "
         "Their posts are marked 'Community TA'.")}"
       data-list-endpoint="${ section_data['list_forum_members_url'] }"