Rename `discussion` → `conversation` (#3308)

37 files changed, 92 insertions, 79 deletions

diff --git a/package-lock.json b/package-lock.json
index 7de5b72e..8a80e215 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7245,9 +7245,9 @@
 			}
 		},
 		"github-url-detection": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/github-url-detection/-/github-url-detection-1.2.3.tgz",
-			"integrity": "sha512-MSmdcZGUs57k8U4vwy/iLD5jHnup86bPKJ3B5JBuDL6qkHy4bd3xW65DdRN0QJIrD33J6Fz3H1/59I4W3LaBnw=="
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/github-url-detection/-/github-url-detection-2.0.0.tgz",
+			"integrity": "sha512-FPofcs0mrBzFSec6DP0asNmjQo8Dyi3ECJC99cCkgyHtEV3rpH5wxr3p+j7j2Z2UcTnKYrybh8yoVNafnBrfvQ=="
 		},
 		"glob": {
 			"version": "7.1.6",
diff --git a/package.json b/package.json
index c5d0877d..d1784a45 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
 		"fit-textarea": "^2.0.0",
 		"flat-zip": "^1.0.1",
 		"github-reserved-names": "^1.1.8",
-		"github-url-detection": "^1.2.3",
+		"github-url-detection": "^2.0.0",
 		"image-promise": "^7.0.1",
 		"indent-textarea": "^2.0.1",
 		"linkify-issues": "2.0.0-nolookbehind",
diff --git a/readme.md b/readme.md
index b0e19cbc..a8318d8b 100644
--- a/readme.md
+++ b/readme.md
@@ -195,28 +195,28 @@ Thanks for contributing! 🦋🙌
 - [](# "scrollable-code-and-blockquote") [Limits the height of tall code blocks and quotes.](https://github.com/sindresorhus/refined-github/issues/1123)
 - [](# "hide-comments-faster") [Simplifies the UI to hide comments.](https://user-images.githubusercontent.com/1402241/43039221-1ddc91f6-8d29-11e8-9ed4-93459191a510.gif)
 - [](# "open-issue-to-latest-comment") [Makes the "comment" icon in issue lists link to the latest comment of the issue.](https://user-images.githubusercontent.com/14323370/57962709-7019de00-78e8-11e9-8398-7e617ba7a96f.png)
-- [](# "expand-all-hidden-comments") [On long discussions where GitHub hides comments under a "Load more...", alt-clicking it will load up to 200 comments at once instead of 60.](https://user-images.githubusercontent.com/1402241/73838332-0c548e00-4846-11ea-935f-28d728b30ae9.png)
+- [](# "expand-all-hidden-comments") [On long conversations where GitHub hides comments under a "Load more...", alt-clicking it will load up to 200 comments at once instead of 60.](https://user-images.githubusercontent.com/1402241/73838332-0c548e00-4846-11ea-935f-28d728b30ae9.png)
 
 <!-- Refer to style guide above. Keep this message between sections. -->
 
-### Discussions
+### Conversations
 
-- [](# "batch-open-issues") 🔥 [Adds a button to open multiple discussions at once in your repos.](https://user-images.githubusercontent.com/1402241/38084752-4820b0d8-3378-11e8-868c-a1582b16f915.gif)
+- [](# "batch-open-conversations") 🔥 [Adds a button to open multiple conversations at once in your repos.](https://user-images.githubusercontent.com/1402241/38084752-4820b0d8-3378-11e8-868c-a1582b16f915.gif)
 - [](# "split-issue-pr-search-results") [Separates issues from PRs in the global search.](https://user-images.githubusercontent.com/1402241/52181103-35a09f80-2829-11e9-9c6f-57f2e08fc5b2.png)
-- [](# "sticky-discussion-sidebar") [Makes the discussion sidebar sticky.](https://user-images.githubusercontent.com/10238474/62276723-5a2eaa80-b44d-11e9-810b-ff598d1c5c6a.gif)
-- [](# "sticky-discussion-list-toolbar") [Makes the discussion list’s filters toolbar sticky.](https://user-images.githubusercontent.com/380914/39878141-7632e61a-542c-11e8-9c66-74fcd3a134aa.gif)
-- [](# "highlight-collaborators-and-own-discussions") [Highlights discussions opened by you or the current repo’s collaborators.](https://user-images.githubusercontent.com/1402241/65013882-03225d80-d947-11e9-8eb8-5507bc1fc14b.png)
+- [](# "sticky-conversation-sidebar") [Makes the conversation sidebar sticky.](https://user-images.githubusercontent.com/10238474/62276723-5a2eaa80-b44d-11e9-810b-ff598d1c5c6a.gif)
+- [](# "sticky-conversation-list-toolbar") [Makes the conversation list’s filters toolbar sticky.](https://user-images.githubusercontent.com/380914/39878141-7632e61a-542c-11e8-9c66-74fcd3a134aa.gif)
+- [](# "highlight-collaborators-and-own-conversations") [Highlights conversations opened by you or the current repo’s collaborators.](https://user-images.githubusercontent.com/1402241/65013882-03225d80-d947-11e9-8eb8-5507bc1fc14b.png)
 - [](# "align-issue-labels") [Aligns labels in lists to the left.](https://user-images.githubusercontent.com/1402241/28006237-070b8214-6581-11e7-94bc-2b01a007d00b.png)
-- [](# "sort-issues-by-update-time") 🔥 Changes the default sort order of discussions to `Recently updated`.
-- [](# "widen-search-field") [Widens the discussion search box.](https://user-images.githubusercontent.com/1402241/55069759-bceaf080-50bf-11e9-84d0-7707de2eb9e9.png)
-- [](# "discussion-filters") [Adds `Everything commented by you` and `Everything you subscribed to` filters in the search box dropdown.](https://user-images.githubusercontent.com/202916/84156153-72a62300-aa69-11ea-8592-3094292fde3c.png)
-- [](# "global-discussion-list-filters") [Adds filters for discussions _in your repos_ and _commented on by you_ in the global discussion search.](https://user-images.githubusercontent.com/8295888/36827126-8bfc79c4-1d37-11e8-8754-992968b082be.png)
-- [](# "clean-sidebar") 🔥 [Hides empty sections (or just their "empty" label) in the discussion sidebar.](https://user-images.githubusercontent.com/1402241/57199809-20691780-6fb6-11e9-9672-1ad3f9e1b827.png)
-- [](# "clean-issue-filters") [Hides `Projects` and `Milestones` filters in discussion lists if they are empty.](https://user-images.githubusercontent.com/37769974/59083449-0ef88f80-8915-11e9-8296-68af1ddcf191.png)
+- [](# "sort-conversations-by-update-time") 🔥 Changes the default sort order of conversations to `Recently updated`.
+- [](# "widen-search-field") [Widens the conversation search box.](https://user-images.githubusercontent.com/1402241/55069759-bceaf080-50bf-11e9-84d0-7707de2eb9e9.png)
+- [](# "conversation-filters") [Adds `Everything commented by you` and `Everything you subscribed to` filters in the search box dropdown.](https://user-images.githubusercontent.com/202916/84156153-72a62300-aa69-11ea-8592-3094292fde3c.png)
+- [](# "global-conversation-list-filters") [Adds filters for conversations _in your repos_ and _commented on by you_ in the global conversation search.](https://user-images.githubusercontent.com/8295888/36827126-8bfc79c4-1d37-11e8-8754-992968b082be.png)
+- [](# "clean-sidebar") 🔥 [Hides empty sections (or just their "empty" label) in the conversation sidebar.](https://user-images.githubusercontent.com/1402241/57199809-20691780-6fb6-11e9-9672-1ad3f9e1b827.png)
+- [](# "clean-conversation-filters") [Hides `Projects` and `Milestones` filters in conversation lists if they are empty.](https://user-images.githubusercontent.com/37769974/59083449-0ef88f80-8915-11e9-8296-68af1ddcf191.png)
 - [](# "cycle-lists-with-keyboard-shortcuts") [Allows the <kbd>↑</kbd> and <kbd>↓</kbd> keys to cycle "popover lists" (labels, milestones, etc).](https://user-images.githubusercontent.com/37769974/59158786-6fd2c400-8add-11e9-9db1-db80186fa6ea.gif)
 - [](# "toggle-everything-with-alt") [Adds a shortcut to toggle all similar items (minimized comments, deferred diffs, etc) at once: <kbd>alt</kbd> <kbd>click</kbd> on each button or checkbox.](https://user-images.githubusercontent.com/37769974/62208543-dcb75b80-b3b4-11e9-984f-ddb479ea149d.gif)
-- [](# "quick-mention") [Adds a button to `@mention` a user in discussions.](https://user-images.githubusercontent.com/1402241/70406615-f445d580-1a73-11ea-9ab1-bf6bd9aa70a3.gif)
-- [](# "extend-discussion-status-filters") [Lets you toggle between is:open/is:closed/is:merged filters in searches.](https://user-images.githubusercontent.com/1402241/73605061-2125ed00-45cc-11ea-8cbd-41a53ae00cd3.gif)
+- [](# "quick-mention") [Adds a button to `@mention` a user in conversations.](https://user-images.githubusercontent.com/1402241/70406615-f445d580-1a73-11ea-9ab1-bf6bd9aa70a3.gif)
+- [](# "extend-conversation-status-filters") [Lets you toggle between is:open/is:closed/is:merged filters in searches.](https://user-images.githubusercontent.com/1402241/73605061-2125ed00-45cc-11ea-8cbd-41a53ae00cd3.gif)
 - [](# "bugs-tab") [Adds a "Bugs" tab to repos, if there are any open issues with the "bug" label.](https://user-images.githubusercontent.com/1402241/73720910-a688d900-4755-11ea-9c8d-70e5ddb3bfe5.png)
 - [](# "pinned-issue-update-time") [Adds the updated time to pinned issues.](https://user-images.githubusercontent.com/1402241/75525936-bb524700-5a4b-11ea-9225-466bda58b7de.png)
 - [](# "clean-pinned-issues") [Changes the layout of pinned issues from side-by-side to a standard list.](https://user-images.githubusercontent.com/1402241/84509958-c82a3c00-acc4-11ea-8399-eaf06a59e9e4.png)
@@ -290,7 +290,7 @@ Thanks for contributing! 🦋🙌
 - [](# "linkify-user-location") [Linkifies the user location in their hovercard and profile page.](https://user-images.githubusercontent.com/1402241/69076885-00d3a100-0a67-11ea-952a-690acec0826f.png)
 - [](# "user-local-time") [Shows the user local time in their hovercard (based on their last commit).](https://user-images.githubusercontent.com/1402241/69863648-ef449180-12cf-11ea-8f36-7c92fc487f31.gif)
 - [](# "hide-zero-packages") [Hides the `Packages` tab on user profiles if it’s empty.](https://user-images.githubusercontent.com/35382021/62426530-688ef780-b6d5-11e9-93f2-515110aed1eb.jpg)
-- [](# "discussion-links-on-repo-lists") [Adds a link to the issues and pulls on the user profile repository tab and global search.](https://user-images.githubusercontent.com/16872793/78712349-82c54900-78e6-11ea-8328-3c2d39a78862.png)
+- [](# "conversation-links-on-repo-lists") [Adds a link to the issues and pulls on the user profile repository tab and global search.](https://user-images.githubusercontent.com/16872793/78712349-82c54900-78e6-11ea-8328-3c2d39a78862.png)
 
 <!-- Refer to style guide above. Keep this message between sections. -->
 
diff --git a/source/features/batch-open-issues.tsx b/source/features/batch-open-conversations.tsx
index 5f90ef76..c5f5b17b 100644
--- a/source/features/batch-open-issues.tsx
+++ b/source/features/batch-open-conversations.tsx
@@ -16,7 +16,7 @@ function getUrlFromItem(checkbox: Element): string {
 }
 
 function openIssues(): void {
-	const modifier = pageDetect.isGlobalDiscussionList() ? '' : ' + div ';
+	const modifier = pageDetect.isGlobalConversationList() ? '' : ' + div ';
 	const issues = select.all([
 		`#js-issues-toolbar.triage-mode ${modifier} [name="issues[]"]:checked`, // Get checked checkboxes
 		`#js-issues-toolbar:not(.triage-mode) ${modifier} .js-issue-row` // Or all items
@@ -41,7 +41,7 @@ async function init(): Promise<void | false> {
 
 	delegate(document, '.rgh-batch-open-issues', 'click', openIssues);
 
-	// Add button to open all visible discussions
+	// Add button to open all visible conversations
 	select('.table-list-header-toggle:not(.states)')?.prepend(
 		<button
 			type="button"
@@ -51,7 +51,7 @@ async function init(): Promise<void | false> {
 		</button>
 	);
 
-	// Add button to open selected discussions
+	// Add button to open selected conversations
 	const triageFiltersBar = select('.table-list-triage > .text-gray');
 	if (triageFiltersBar) {
 		triageFiltersBar.classList.add('table-list-header-toggle'); // Handles link :hover style
@@ -68,11 +68,11 @@ async function init(): Promise<void | false> {
 
 void features.add({
 	id: __filebasename,
-	description: 'Adds a button to open multiple discussions at once in your repos.',
+	description: 'Adds a button to open multiple conversations at once in your repos.',
 	screenshot: 'https://user-images.githubusercontent.com/1402241/38084752-4820b0d8-3378-11e8-868c-a1582b16f915.gif'
 }, {
 	include: [
-		pageDetect.isDiscussionList
+		pageDetect.isConversationList
 	],
 	waitForDomReady: false,
 	init
diff --git a/source/features/clean-issue-filters.tsx b/source/features/clean-conversation-filters.tsx
index ae84457e..35de266a 100644
--- a/source/features/clean-issue-filters.tsx
+++ b/source/features/clean-conversation-filters.tsx
@@ -73,11 +73,11 @@ async function init(): Promise<void | false> {
 
 void features.add({
 	id: __filebasename,
-	description: 'Hides `Projects` and `Milestones` filters in discussion lists if they are empty.',
+	description: 'Hides `Projects` and `Milestones` filters in conversation lists if they are empty.',
 	screenshot: 'https://user-images.githubusercontent.com/37769974/59083449-0ef88f80-8915-11e9-8296-68af1ddcf191.png'
 }, {
 	include: [
-		pageDetect.isRepoDiscussionList
+		pageDetect.isRepoConversationList
 	],
 	waitForDomReady: false,
 	init
diff --git a/source/features/clean-discussions.css b/source/features/clean-conversations.css
index 2428429e..2428429e 100644
--- a/source/features/clean-discussions.css
+++ b/source/features/clean-conversations.css
diff --git a/source/features/clean-notifications.css b/source/features/clean-notifications.css
index 1bbcb1ef..eee19367 100644
--- a/source/features/clean-notifications.css
+++ b/source/features/clean-notifications.css
@@ -1,4 +1,4 @@
-/* Place discussion number before the title */
+/* Place conversation number before the title */
 .js-notifications-group [id^='notification'] {
 	flex-direction: row !important;
 }
@@ -6,12 +6,12 @@
 .js-notifications-group [id^='notification'] > .d-flex > .f6 {
 	font-size: 0 !important;
 }
-/* Size and position the discussion number */
+/* Size and position the conversation number */
 .js-notifications-group [id^='notification'] > .d-flex > .f6 > span {
 	display: block;
 	font-size: 12px;
 	font-variant-numeric: tabular-nums;
-	margin-top: 2px; /* Align baseline with discussion title */
+	margin-top: 2px; /* Align baseline with conversation title */
 	margin-right: 8px;
 	word-break: keep-all;
 }
diff --git a/source/features/clean-sidebar.tsx b/source/features/clean-sidebar.tsx
index c50fac52..143a97ce 100644
--- a/source/features/clean-sidebar.tsx
+++ b/source/features/clean-sidebar.tsx
@@ -107,7 +107,7 @@ async function clean(): Promise<void> {
 
 void features.add({
 	id: __filebasename,
-	description: 'Hides empty sections (or just their "empty" label) in the discussion sidebar.',
+	description: 'Hides empty sections (or just their "empty" label) in the conversation sidebar.',
 	screenshot: 'https://user-images.githubusercontent.com/1402241/57199809-20691780-6fb6-11e9-9672-1ad3f9e1b827.png'
 }, {
 	include: [
diff --git a/source/features/conflict-marker.tsx b/source/features/conflict-marker.tsx
index a650fa9a..928f6730 100644
--- a/source/features/conflict-marker.tsx
+++ b/source/features/conflict-marker.tsx
@@ -72,7 +72,7 @@ void features.add({
 		'https://user-images.githubusercontent.com/9092510/62777551-2affe500-baae-11e9-8ba4-67f078347913.png'
 }, {
 	include: [
-		pageDetect.isDiscussionList
+		pageDetect.isConversationList
 	],
 	init
 });
diff --git a/source/features/discussion-filters.tsx b/source/features/conversation-filters.tsx
index 3c33cbf1..04e50c25 100644
--- a/source/features/discussion-filters.tsx
+++ b/source/features/conversation-filters.tsx
@@ -40,7 +40,7 @@ void features.add({
 	screenshot: 'https://user-images.githubusercontent.com/202916/84156153-72a62300-aa69-11ea-8592-3094292fde3c.png'
 }, {
 	include: [
-		pageDetect.isRepoDiscussionList
+		pageDetect.isRepoConversationList
 	],
 	init
 });
diff --git a/source/features/discussion-links-on-repo-lists.tsx b/source/features/conversation-links-on-repo-lists.tsx
index 5a02b4f5..5a02b4f5 100644
--- a/source/features/discussion-links-on-repo-lists.tsx
+++ b/source/features/conversation-links-on-repo-lists.tsx
diff --git a/source/features/dim-bots.tsx b/source/features/dim-bots.tsx
index 556ff0c4..887a8027 100644
--- a/source/features/dim-bots.tsx
+++ b/source/features/dim-bots.tsx
@@ -27,7 +27,7 @@ void features.add({
 }, {
 	include: [
 		pageDetect.isCommitList,
-		pageDetect.isDiscussionList
+		pageDetect.isConversationList
 	],
 	init
 });
diff --git a/source/features/expand-all-hidden-comments.tsx b/source/features/expand-all-hidden-comments.tsx
index 4b6b4311..a8d5dfaf 100644
--- a/source/features/expand-all-hidden-comments.tsx
+++ b/source/features/expand-all-hidden-comments.tsx
@@ -31,7 +31,7 @@ function init(): void {
 
 void features.add({
 	id: __filebasename,
-	description: 'On long discussions where GitHub hides comments under a "Load more...", alt-clicking it will load up to 200 comments at once instead of 60.',
+	description: 'On long conversations where GitHub hides comments under a "Load more...", alt-clicking it will load up to 200 comments at once instead of 60.',
 	screenshot: 'https://user-images.githubusercontent.com/1402241/73838332-0c548e00-4846-11ea-935f-28d728b30ae9.png'
 }, {
 	include: [
diff --git a/source/features/extend-discussion-status-filters.tsx b/source/features/extend-conversation-status-filters.tsx
index 5295a13b..3e7fe5c4 100644
--- a/source/features/extend-discussion-status-filters.tsx
+++ b/source/features/extend-conversation-status-filters.tsx
@@ -67,7 +67,7 @@ void features.add({
 	screenshot: 'https://user-images.githubusercontent.com/1402241/73605061-2125ed00-45cc-11ea-8cbd-41a53ae00cd3.gif'
 }, {
 	include: [
-		pageDetect.isDiscussionList
+		pageDetect.isConversationList
 	],
 	waitForDomReady: false,
 	init
diff --git a/source/features/format-discussion-titles.tsx b/source/features/format-conversation-titles.tsx
index 9bd328a3..9bd328a3 100644
--- a/source/features/format-discussion-titles.tsx
+++ b/source/features/format-conversation-titles.tsx
diff --git a/source/features/global-discussion-list-filters.css b/source/features/global-conversation-list-filters.css
index 37001c1c..37001c1c 100644
--- a/source/features/global-discussion-list-filters.css
+++ b/source/features/global-conversation-list-filters.css
diff --git a/source/features/global-discussion-list-filters.tsx b/source/features/global-conversation-list-filters.tsx
index fec36e72..16af14a8 100644
--- a/source/features/global-discussion-list-filters.tsx
+++ b/source/features/global-conversation-list-filters.tsx
@@ -1,4 +1,4 @@
-import './global-discussion-list-filters.css';
+import './global-conversation-list-filters.css';
 import React from 'dom-chef';
 import select from 'select-dom';
 import * as pageDetect from 'github-url-detection';
@@ -44,11 +44,11 @@ function init(): void {
 
 void features.add({
 	id: __filebasename,
-	description: 'Adds filters for discussions _in your repos_ and _commented on by you_ in the global discussion search.',
+	description: 'Adds filters for conversations _in your repos_ and _commented on by you_ in the global conversation search.',
 	screenshot: 'https://user-images.githubusercontent.com/8295888/36827126-8bfc79c4-1d37-11e8-8754-992968b082be.png'
 }, {
 	include: [
-		pageDetect.isGlobalDiscussionList
+		pageDetect.isGlobalConversationList
 	],
 	init
 });
diff --git a/source/features/hide-issue-list-autocomplete.tsx b/source/features/hide-issue-list-autocomplete.tsx
index 8ee12186..629714b7 100644
--- a/source/features/hide-issue-list-autocomplete.tsx
+++ b/source/features/hide-issue-list-autocomplete.tsx
@@ -13,7 +13,7 @@ void features.add({
 	screenshot: 'https://user-images.githubusercontent.com/1402241/42991841-1f057e4e-8c07-11e8-909c-b051db7a2a03.png'
 }, {
 	include: [
-		pageDetect.isDiscussionList
+		pageDetect.isConversationList
 	],
 	init
 });
diff --git a/source/features/highlight-collaborators-and-own-discussions.css b/source/features/highlight-collaborators-and-own-conversations.css
index 86184a93..86184a93 100644
--- a/source/features/highlight-collaborators-and-own-discussions.css
+++ b/source/features/highlight-collaborators-and-own-conversations.css
diff --git a/source/features/highlight-collaborators-and-own-discussions.tsx b/source/features/highlight-collaborators-and-own-conversations.tsx
index ed3271b9..f8299d4c 100644
--- a/source/features/highlight-collaborators-and-own-discussions.tsx
+++ b/source/features/highlight-collaborators-and-own-conversations.tsx
@@ -1,4 +1,4 @@
-import './highlight-collaborators-and-own-discussions.css';
+import './highlight-collaborators-and-own-conversations.css';
 import cache from 'webext-storage-cache';
 import select from 'select-dom';
 import * as pageDetect from 'github-url-detection';
@@ -43,16 +43,16 @@ function highlightSelf(): void {
 
 void features.add({
 	id: __filebasename,
-	description: 'Highlights discussions opened by you or the current repo’s collaborators.',
+	description: 'Highlights conversations opened by you or the current repo’s collaborators.',
 	screenshot: 'https://user-images.githubusercontent.com/1402241/65013882-03225d80-d947-11e9-8eb8-5507bc1fc14b.png'
 }, {
 	include: [
-		pageDetect.isRepoDiscussionList
+		pageDetect.isRepoConversationList
 	],
 	init: highlightCollaborators
 }, {
 	include: [
-		pageDetect.isDiscussionList
+		pageDetect.isConversationList
 	],
 	init: highlightSelf
 });
diff --git a/source/features/open-issue-to-latest-comment.tsx b/source/features/open-issue-to-latest-comment.tsx
index c13d58c9..e40a9425 100644
--- a/source/features/open-issue-to-latest-comment.tsx
+++ b/source/features/open-issue-to-latest-comment.tsx
@@ -26,7 +26,7 @@ void features.add({
 	screenshot: 'https://user-images.githubusercontent.com/14323370/57962709-7019de00-78e8-11e9-8398-7e617ba7a96f.png'
 }, {
 	include: [
-		pageDetect.isDiscussionList
+		pageDetect.isConversationList
 	],
 	init
 }, {
diff --git a/source/features/parse-backticks.tsx b/source/features/parse-backticks.tsx
index 25c924e6..8936792d 100644
--- a/source/features/parse-backticks.tsx
+++ b/source/features/parse-backticks.tsx
@@ -12,7 +12,7 @@ function init(): void {
 		'.commit-message', // Pushed commits in `isPRConversation`, `isCompare`, `isReleasesOrTags`
 		'.message', // `isCommitList`, `isRepoTree`, `isBlame`
 		'.Box--condensed .link-gray[href*="/commit/"]', // `isSingleFile`
-		'[aria-label="Issues"][role="group"] .js-navigation-open', // `isDiscussionList`
+		'[aria-label="Issues"][role="group"] .js-navigation-open', // `isConversationList`
 		'[id^=ref-issue-]', // Issue references in `isIssue`, `isPRConversation`
 		'[id^=ref-pullrequest-]', // PR references in `isIssue`, `isPRConversation`
 		'.TimelineItem-body > del, .TimelineItem-body > ins', // Title edits in `isIssue`, `isPRConversation`
@@ -22,7 +22,7 @@ function init(): void {
 		'.js-recent-activity-container .text-bold', // `isDashboard`"Recent activity" titles
 		'.commits blockquote', // Newsfeed commits
 		'.release-header', // `isReleasesOrTags` Headers
-		'.Box-row.js-navigation-item a.link-gray-dark', // `isGlobalDiscussionList`
+		'.Box-row.js-navigation-item a.link-gray-dark', // `isGlobalConversationList`
 		'[data-channel^="check_suites"] a', // `isActions`
 		'.repository-content .pr-toolbar h2', // `isActions` run
 		'#wiki-wrapper h1' // `isWiki`
diff --git a/source/features/pr-branches.tsx b/source/features/pr-branches.tsx
index e23990dc..724ff8d7 100644
--- a/source/features/pr-branches.tsx
+++ b/source/features/pr-branches.tsx
@@ -149,7 +149,7 @@ void features.add({
 	screenshot: 'https://user-images.githubusercontent.com/1402241/51428391-ae9ed500-1c35-11e9-8e54-6b6a424fede4.png'
 }, {
 	include: [
-		pageDetect.isRepoDiscussionList
+		pageDetect.isRepoConversationList
 	],
 	init
 });
diff --git a/source/features/quick-mention.tsx b/source/features/quick-mention.tsx
index 1e341b39..0a9972f1 100644
--- a/source/features/quick-mention.tsx
+++ b/source/features/quick-mention.tsx
@@ -48,7 +48,7 @@ function init(): void {
 
 void features.add({
 	id: __filebasename,
-	description: 'Adds a button to @mention a user in discussions.',
+	description: 'Adds a button to @mention a user in conversations.',
 	screenshot: 'https://user-images.githubusercontent.com/1402241/70406615-f445d580-1a73-11ea-9ab1-bf6bd9aa70a3.gif'
 }, {
 	include: [
@@ -56,7 +56,7 @@ void features.add({
 		pageDetect.isPRConversation
 	],
 	exclude: [
-		() => select.exists('.conversation-limited') // Discussion is locked
+		() => select.exists('.conversation-limited') // Conversation is locked
 	],
 	additionalListeners: [
 		onNewComments
diff --git a/source/features/repo-wide-file-finder.tsx b/source/features/repo-wide-file-finder.tsx
index aa00affa..0490e31d 100644
--- a/source/features/repo-wide-file-finder.tsx
+++ b/source/features/repo-wide-file-finder.tsx
@@ -23,7 +23,7 @@ void features.add({
 	screenshot: false
 }, {
 	include: [
-		pageDetect.isRepoDiscussionList,
+		pageDetect.isRepoConversationList,
 		pageDetect.isPR,
 		pageDetect.isIssue
 	],
diff --git a/source/features/restore-file.tsx b/source/features/restore-file.tsx
index e5722771..4643f72b 100644
--- a/source/features/restore-file.tsx
+++ b/source/features/restore-file.tsx
@@ -8,7 +8,7 @@ import features from '.';
 import * as api from '../github-helpers/api';
 import fetchDom from '../helpers/fetch-dom';
 import postForm from '../helpers/post-form';
-import {getDiscussionNumber, getRepoGQL, getRepoURL, getCurrentBranch} from '../github-helpers';
+import {getConversationNumber, getRepoGQL, getRepoURL, getCurrentBranch} from '../github-helpers';
 
 function showError(menuItem: HTMLButtonElement, error: string): void {
 	menuItem.disabled = true;
@@ -23,7 +23,7 @@ This value is not consistently available on the page (appears in `/files` but no
 const getBaseReference = onetime(async (): Promise<string> => {
 	const {repository} = await api.v4(`
 		repository(${getRepoGQL()}) {
-			pullRequest(number: ${getDiscussionNumber()!}) {
+			pullRequest(number: ${getConversationNumber()!}) {
 				baseRefOid
 			}
 		}
diff --git a/source/features/sort-issues-by-update-time.tsx b/source/features/sort-conversations-by-update-time.tsx
index 2ff014ef..e0c09b3d 100644
--- a/source/features/sort-issues-by-update-time.tsx
+++ b/source/features/sort-conversations-by-update-time.tsx
@@ -31,13 +31,13 @@ function init(): void {
 
 void features.add({
 	id: __filebasename,
-	description: 'Changes the default sort order of discussions to `Recently updated`.',
+	description: 'Changes the default sort order of conversations to `Recently updated`.',
 	screenshot: false
 }, {
 	init
 }, {
 	include: [
-		pageDetect.isGlobalDiscussionList
+		pageDetect.isGlobalConversationList
 	],
 	waitForDomReady: false,
 	repeatOnAjax: false,
diff --git a/source/features/split-issue-pr-search-results.tsx b/source/features/split-issue-pr-search-results.tsx
index 7e40a2f1..af66a012 100644
--- a/source/features/split-issue-pr-search-results.tsx
+++ b/source/features/split-issue-pr-search-results.tsx
@@ -12,9 +12,9 @@ function cleanLinks(): void {
 	}
 }
 
-type GitHubDiscussionType = 'pr' | 'issue';
+type GitHubConversationType = 'pr' | 'issue';
 
-function createUrl(type: GitHubDiscussionType, pathname = location.pathname): string {
+function createUrl(type: GitHubConversationType, pathname = location.pathname): string {
 	const url = new URL(pathname, location.origin);
 	url.searchParams.set('q', pageSearchQuery.get() + ` is:${type}`);
 	url.searchParams.set('type', 'Issues');
diff --git a/source/features/sticky-discussion-list-toolbar.css b/source/features/sticky-conversation-list-toolbar.css
index 369cdaea..369cdaea 100644
--- a/source/features/sticky-discussion-list-toolbar.css
+++ b/source/features/sticky-conversation-list-toolbar.css
diff --git a/source/features/sticky-discussion-sidebar.css b/source/features/sticky-conversation-sidebar.css
index 562743c6..7a815d4b 100644
--- a/source/features/sticky-discussion-sidebar.css
+++ b/source/features/sticky-conversation-sidebar.css
@@ -5,7 +5,7 @@
 .rgh-sticky-sidebar {
 	position: sticky;
 	top: 60px !important; /* Matches sticky header's height */
-	z-index: 1; /* Needed so the backdrop of notification modal is over the other elements in the discussion */
+	z-index: 1; /* Needed so the backdrop of notification modal is over the other elements in the conversation */
 }
 
 /* Hides the last divider (on pull requests) to avoid https://user-images.githubusercontent.com/10238474/62282128-af6fb980-b457-11e9-8b18-c29687b88da1.gif */
diff --git a/source/features/sticky-discussion-sidebar.tsx b/source/features/sticky-conversation-sidebar.tsx
index 41c7bab3..8446a9bd 100644
--- a/source/features/sticky-discussion-sidebar.tsx
+++ b/source/features/sticky-conversation-sidebar.tsx
@@ -1,4 +1,4 @@
-import './sticky-discussion-sidebar.css';
+import './sticky-conversation-sidebar.css';
 import select from 'select-dom';
 import debounce from 'debounce-fn';
 import * as pageDetect from 'github-url-detection';
@@ -22,7 +22,7 @@ function deinit(): void {
 
 void features.add({
 	id: __filebasename,
-	description: 'Makes the discussion sidebar sticky.',
+	description: 'Makes the conversation sidebar sticky.',
 	screenshot: 'https://user-images.githubusercontent.com/10238474/62276723-5a2eaa80-b44d-11e9-810b-ff598d1c5c6a.gif'
 }, {
 	include: [
diff --git a/source/features/update-pr-from-base-branch.tsx b/source/features/update-pr-from-base-branch.tsx
index 6ec00a46..c25fe428 100644
--- a/source/features/update-pr-from-base-branch.tsx
+++ b/source/features/update-pr-from-base-branch.tsx
@@ -7,7 +7,7 @@ import * as pageDetect from 'github-url-detection';
 import features from '.';
 import * as api from '../github-helpers/api';
 import observeElement from '../helpers/simplified-element-observer';
-import {getRepoURL, getDiscussionNumber} from '../github-helpers';
+import {getRepoURL, getConversationNumber} from '../github-helpers';
 
 let observer: MutationObserver;
 
@@ -19,7 +19,7 @@ function getBranches(): {base: string; head: string} {
 }
 
 async function mergeBranches(): Promise<AnyObject> {
-	return api.v3(`repos/${getRepoURL()}/pulls/${getDiscussionNumber()!}/update-branch`, {
+	return api.v3(`repos/${getRepoURL()}/pulls/${getConversationNumber()!}/update-branch`, {
 		method: 'PUT',
 		headers: {
 			Accept: 'application/vnd.github.lydian-preview+json'
diff --git a/source/github-helpers/index.ts b/source/github-helpers/index.ts
index 0eea0b02..3a58050c 100644
--- a/source/github-helpers/index.ts
+++ b/source/github-helpers/index.ts
@@ -7,7 +7,7 @@ import * as pageDetect from 'github-url-detection/esm/index.js'; // eslint-disab
 export const getUsername = oneTime(pageDetect.utils.getUsername);
 export const {getRepoPath, getCleanPathname} = pageDetect.utils;
 
-export const getDiscussionNumber = (): string | undefined => {
+export const getConversationNumber = (): string | undefined => {
 	if (pageDetect.isPR() || pageDetect.isIssue()) {
 		return getCleanPathname().split('/')[3];
 	}
diff --git a/source/options-storage.ts b/source/options-storage.ts
index b6ea7613..51eff6f1 100644
--- a/source/options-storage.ts
+++ b/source/options-storage.ts
@@ -21,6 +21,19 @@ const migrations = [
 	featureWasRenamed('fix-view-file-link-in-pr', 'enable-file-links-in-compare-view'), // Merged on June 3rd
 	featureWasRenamed('revert-file', 'restore-file'), // Merged on June 16th
 
+	// Merged on July 2nd
+	featureWasRenamed('sticky-discussion-list-toolbar', 'sticky-conversation-list-toolbar'),
+	featureWasRenamed('highlight-collaborators-and-own-discussions', 'highlight-collaborators-and-own-conversations'),
+	featureWasRenamed('discussion-filters', 'conversation-filters'),
+	featureWasRenamed('global-discussion-list-filters', 'global-conversation-list-filters'),
+	featureWasRenamed('extend-discussion-status-filters', 'extend-conversation-status-filters'),
+	featureWasRenamed('discussion-links-on-repo-lists', 'conversation-links-on-repo-lists'),
+	featureWasRenamed('format-discussion-titles', 'format-conversation-titles'),
+	featureWasRenamed('sticky-discussion-sidebar', 'sticky-conversation-sidebar'),
+	featureWasRenamed('batch-open-issues', 'batch-open-conversations'),
+	featureWasRenamed('sort-issues-by-update-time', 'sort-conversations-by-update-time'),
+	featureWasRenamed('clean-issue-filters', 'clean-conversation-filters'),
+
 	// Removed features will be automatically removed from the options as well
 	OptionsSyncPerDomain.migrations.removeUnused
 ];
diff --git a/source/refined-github.css b/source/refined-github.css
index e3963125..cbca1806 100644
--- a/source/refined-github.css
+++ b/source/refined-github.css
@@ -108,8 +108,8 @@
 	transform-origin: 90% top;
 }
 
-/* Improve spacing in discussion lists meta, made feel crowded by:
-highlight-collaborators-and-own-discussions
+/* Improve spacing in conversation lists meta, made feel crowded by:
+highlight-collaborators-and-own-conversations
 parse-backticks
 pr-branches
 */
diff --git a/source/refined-github.ts b/source/refined-github.ts
index 43c608d6..3e55a45e 100644
--- a/source/refined-github.ts
+++ b/source/refined-github.ts
@@ -12,8 +12,8 @@ import './features/pr-approvals-count.css';
 import './features/hide-tips.css';
 import './features/hide-readme-header.css';
 import './features/hide-obvious-tooltips.css';
-import './features/clean-discussions.css';
-import './features/sticky-discussion-list-toolbar.css';
+import './features/clean-conversations.css';
+import './features/sticky-conversation-list-toolbar.css';
 import './features/always-show-branch-delete-buttons.css';
 import './features/easier-pr-sha-copy.css';
 import './features/repo-stats-spacing.css';
@@ -56,13 +56,13 @@ import './features/shorten-links';
 import './features/linkify-code';
 import './features/download-folder-button';
 import './features/linkify-branch-references';
-import './features/batch-open-issues';
+import './features/batch-open-conversations';
 import './features/hide-useless-comments';
 import './features/navigate-pages-with-arrow-keys';
-import './features/discussion-links-on-repo-lists';
-import './features/global-discussion-list-filters';
-import './features/discussion-filters';
-import './features/sort-issues-by-update-time'; // Must be after global-discussion-list-filters and discussion-filters and discussion-links-on-repo-lists
+import './features/conversation-links-on-repo-lists';
+import './features/global-conversation-list-filters';
+import './features/conversation-filters';
+import './features/sort-conversations-by-update-time'; // Must be after global-conversation-list-filters and conversation-filters and conversation-links-on-repo-lists
 import './features/pinned-issues-update-time';
 import './features/latest-tag-button';
 import './features/default-branch-button';
@@ -77,7 +77,7 @@ import './features/wait-for-build';
 import './features/hide-inactive-deployments';
 import './features/pull-request-hotkey';
 import './features/quick-review-buttons';
-import './features/format-discussion-titles';
+import './features/format-conversation-titles';
 import './features/embed-gist-inline';
 import './features/comments-time-machine-links';
 import './features/hide-issue-list-autocomplete';
@@ -122,13 +122,13 @@ import './features/hide-disabled-milestone-sorter';
 import './features/tag-changelog-link';
 import './features/link-to-file-in-file-history';
 import './features/clean-sidebar';
-import './features/sticky-discussion-sidebar';
+import './features/sticky-conversation-sidebar';
 import './features/release-download-count';
 import './features/open-issue-to-latest-comment';
 import './features/toggle-everything-with-alt';
 import './features/suggest-commit-title-limit';
 import './features/highest-rated-comment';
-import './features/clean-issue-filters';
+import './features/clean-conversation-filters';
 import './features/minimize-upload-bar';
 import './features/cycle-lists-with-keyboard-shortcuts';
 import './features/add-tag-to-commits';
@@ -144,7 +144,7 @@ import './features/restore-file';
 import './features/hidden-review-comments-indicator';
 import './features/reload-failed-proxied-images';
 import './features/clean-rich-text-editor';
-import './features/highlight-collaborators-and-own-discussions';
+import './features/highlight-collaborators-and-own-conversations';
 import './features/embed-gist-via-iframe';
 import './features/expand-all-collapsed-code';
 import './features/separate-draft-pr-button';
@@ -157,7 +157,7 @@ import './features/linkify-user-location';
 import './features/repo-age';
 import './features/user-local-time';
 import './features/quick-mention';
-import './features/extend-discussion-status-filters';
+import './features/extend-conversation-status-filters';
 import './features/expand-all-hidden-comments';
 import './features/bugs-tab';
 import './features/cross-deleted-pr-branches';
diff --git a/test/helpers.ts b/test/helpers.ts
index 61fd11ed..fbac4771 100644
--- a/test/helpers.ts
+++ b/test/helpers.ts
@@ -3,7 +3,7 @@ import test from 'ava';
 import './fixtures/globals';
 import pluralize from '../source/helpers/pluralize';
 import {
-	getDiscussionNumber,
+	getConversationNumber,
 	getRepositoryInfo,
 	parseTag,
 	compareNames,
@@ -14,7 +14,7 @@ import {
 	prCommitUrlRegex
 } from '../source/github-helpers';
 
-test('getDiscussionNumber', t => {
+test('getConversationNumber', t => {
 	const pairs = new Map<string, string | undefined>([
 		[
 			'https://github.com',
@@ -79,7 +79,7 @@ test('getDiscussionNumber', t => {
 	]);
 	for (const [url, result] of pairs) {
 		location.href = url;
-		t.is(result, getDiscussionNumber());
+		t.is(result, getConversationNumber());
 	}
 });