diff --git a/pkg/cmd/issue/comment/comment_test.go b/pkg/cmd/issue/comment/comment_test.go
index 55b15d740..794dafda4 100644
--- a/pkg/cmd/issue/comment/comment_test.go
+++ b/pkg/cmd/issue/comment/comment_test.go
@@ -226,7 +226,7 @@ func Test_commentRun(t *testing.T) {
 		wantsErr      bool
 	}{
 		{
-			name: "creating new issue comment with interactive editor succeeds",
+			name: "creating new comment with interactive editor succeeds",
 			input: &shared.CommentableOptions{
 				Interactive: true,
 				InputType:   0,
@@ -242,7 +242,7 @@ func Test_commentRun(t *testing.T) {
 			stdout: "https://github.com/OWNER/REPO/issues/123#issuecomment-456\n",
 		},
 		{
-			name: "updating last issue comment with interactive editor fails if there are no comments and decline prompt to create",
+			name: "updating last comment with interactive editor fails if there are no comments and decline prompt to create",
 			input: &shared.CommentableOptions{
 				Interactive: true,
 				InputType:   0,
@@ -257,7 +257,7 @@ func Test_commentRun(t *testing.T) {
 			wantsErr:      true,
 		},
 		{
-			name: "updating last issue comment with interactive editor succeeds if there are comments",
+			name: "updating last comment with interactive editor succeeds if there are comments",
 			input: &shared.CommentableOptions{
 				Interactive: true,
 				InputType:   0,
@@ -274,7 +274,7 @@ func Test_commentRun(t *testing.T) {
 			stdout:        "https://github.com/OWNER/REPO/issues/123#issuecomment-111\n",
 		},
 		{
-			name: "updating last issue comment with interactive editor creates new comment if there are no comments but --create-if-none",
+			name: "updating last comment with interactive editor creates new comment if there are no comments but --create-if-none",
 			input: &shared.CommentableOptions{
 				Interactive:  true,
 				InputType:    0,
@@ -294,7 +294,7 @@ func Test_commentRun(t *testing.T) {
 			stdout:        "https://github.com/OWNER/REPO/issues/123#issuecomment-456\n",
 		},
 		{
-			name: "creating new issue comment with non-interactive web opens issue in browser focusing on new comment",
+			name: "creating new comment with non-interactive web opens issue in browser focusing on new comment",
 			input: &shared.CommentableOptions{
 				Interactive: false,
 				InputType:   shared.InputTypeWeb,
@@ -306,7 +306,7 @@ func Test_commentRun(t *testing.T) {
 			stderr:        "Opening https://github.com/OWNER/REPO/issues/123 in your browser.\n",
 		},
 		{
-			name: "updating last issue comment with non-interactive web opens issue in browser focusing on the last comment",
+			name: "updating last comment with non-interactive web opens issue in browser focusing on the last comment",
 			input: &shared.CommentableOptions{
 				Interactive: false,
 				InputType:   shared.InputTypeWeb,
@@ -322,7 +322,7 @@ func Test_commentRun(t *testing.T) {
 			stderr:        "Opening https://github.com/OWNER/REPO/issues/123 in your browser.\n",
 		},
 		{
-			name: "updating last issue comment with non-interactive web errors because there are no comments",
+			name: "updating last comment with non-interactive web errors because there are no comments",
 			input: &shared.CommentableOptions{
 				Interactive: false,
 				InputType:   shared.InputTypeWeb,
@@ -333,7 +333,7 @@ func Test_commentRun(t *testing.T) {
 			wantsErr:      true,
 		},
 		{
-			name: "creating new issue comment with non-interactive editor succeeds",
+			name: "creating new comment with non-interactive editor succeeds",
 			input: &shared.CommentableOptions{
 				Interactive: false,
 				InputType:   shared.InputTypeEditor,
@@ -347,7 +347,7 @@ func Test_commentRun(t *testing.T) {
 			stdout: "https://github.com/OWNER/REPO/issues/123#issuecomment-456\n",
 		},
 		{
-			name: "updating last issue comment with non-interactive editor fails if there are no comments",
+			name: "updating last comment with non-interactive editor fails if there are no comments",
 			input: &shared.CommentableOptions{
 				Interactive: false,
 				InputType:   shared.InputTypeEditor,
@@ -360,7 +360,7 @@ func Test_commentRun(t *testing.T) {
 			wantsErr:      true,
 		},
 		{
-			name: "updating last issue comment with non-interactive editor succeeds if there are comments",
+			name: "updating last comment with non-interactive editor succeeds if there are comments",
 			input: &shared.CommentableOptions{
 				Interactive: false,
 				InputType:   shared.InputTypeEditor,
@@ -376,7 +376,7 @@ func Test_commentRun(t *testing.T) {
 			stdout:        "https://github.com/OWNER/REPO/issues/123#issuecomment-111\n",
 		},
 		{
-			name: "updating last issue comment with non-interactive editor creates new comment if there are no comments but --create-if-none",
+			name: "updating last comment with non-interactive editor creates new comment if there are no comments but --create-if-none",
 			input: &shared.CommentableOptions{
 				Interactive:  false,
 				InputType:    shared.InputTypeEditor,
@@ -393,7 +393,7 @@ func Test_commentRun(t *testing.T) {
 			stdout: "https://github.com/OWNER/REPO/issues/123#issuecomment-456\n",
 		},
 		{
-			name: "creating new issue comment with non-interactive succeeds if comment body is provided",
+			name: "creating new comment with non-interactive inline succeeds if comment body is provided",
 			input: &shared.CommentableOptions{
 				Interactive: false,
 				InputType:   shared.InputTypeInline,
@@ -405,7 +405,7 @@ func Test_commentRun(t *testing.T) {
 			stdout: "https://github.com/OWNER/REPO/issues/123#issuecomment-456\n",
 		},
 		{
-			name: "updating last issue comment with non-interactive succeeds if there are comments and comment body is provided",
+			name: "updating last comment with non-interactive inline succeeds if there are comments and comment body is provided",
 			input: &shared.CommentableOptions{
 				Interactive: false,
 				InputType:   shared.InputTypeInline,
@@ -419,7 +419,7 @@ func Test_commentRun(t *testing.T) {
 			stdout:        "https://github.com/OWNER/REPO/issues/123#issuecomment-111\n",
 		},
 		{
-			name: "updating last issue comment with non-interactive creates new comment if there are no comments but --create-if-none",
+			name: "updating last comment with non-interactive inline creates new comment if there are no comments but --create-if-none",
 			input: &shared.CommentableOptions{
 				Interactive:  false,
 				InputType:    shared.InputTypeInline,
diff --git a/pkg/cmd/pr/comment/comment_test.go b/pkg/cmd/pr/comment/comment_test.go
index 1c668a805..0941f2533 100644
--- a/pkg/cmd/pr/comment/comment_test.go
+++ b/pkg/cmd/pr/comment/comment_test.go
@@ -246,7 +246,7 @@ func Test_commentRun(t *testing.T) {
 		wantsErr      bool
 	}{
 		{
-			name: "creating new PR comment with interactive editor succeeds",
+			name: "creating new comment with interactive editor succeeds",
 			input: &shared.CommentableOptions{
 				Interactive: true,
 				InputType:   0,
@@ -261,7 +261,7 @@ func Test_commentRun(t *testing.T) {
 			stdout: "https://github.com/OWNER/REPO/pull/123#issuecomment-456\n",
 		},
 		{
-			name: "updating last PR comment with interactive editor fails if there are no comments and decline prompt to create",
+			name: "updating last comment with interactive editor fails if there are no comments and decline prompt to create",
 			input: &shared.CommentableOptions{
 				Interactive: true,
 				InputType:   0,
@@ -276,7 +276,7 @@ func Test_commentRun(t *testing.T) {
 			wantsErr:      true,
 		},
 		{
-			name: "updating last PR comment with interactive editor succeeds if there are comments",
+			name: "updating last comment with interactive editor succeeds if there are comments",
 			input: &shared.CommentableOptions{
 				Interactive: true,
 				InputType:   0,
@@ -293,7 +293,7 @@ func Test_commentRun(t *testing.T) {
 			stdout:        "https://github.com/OWNER/REPO/pull/123#issuecomment-111\n",
 		},
 		{
-			name: "updating last PR comment with interactive editor creates new comment if there are no comments but --create-if-none",
+			name: "updating last comment with interactive editor creates new comment if there are no comments but --create-if-none",
 			input: &shared.CommentableOptions{
 				Interactive:  true,
 				InputType:    0,
@@ -313,7 +313,7 @@ func Test_commentRun(t *testing.T) {
 			stdout:        "https://github.com/OWNER/REPO/pull/123#issuecomment-456\n",
 		},
 		{
-			name: "creating new PR comment with non-interactive web opens issue in browser focusing on new comment",
+			name: "creating new comment with non-interactive web opens pull request in browser focusing on new comment",
 			input: &shared.CommentableOptions{
 				Interactive: false,
 				InputType:   shared.InputTypeWeb,
@@ -325,7 +325,7 @@ func Test_commentRun(t *testing.T) {
 			stderr:        "Opening https://github.com/OWNER/REPO/pull/123 in your browser.\n",
 		},
 		{
-			name: "updating last PR comment with non-interactive web opens issue in browser focusing on the last comment",
+			name: "updating last comment with non-interactive web opens pull request in browser focusing on the last comment",
 			input: &shared.CommentableOptions{
 				Interactive: false,
 				InputType:   shared.InputTypeWeb,
@@ -341,7 +341,7 @@ func Test_commentRun(t *testing.T) {
 			stderr:        "Opening https://github.com/OWNER/REPO/pull/123 in your browser.\n",
 		},
 		{
-			name: "updating last PR comment with non-interactive web errors because there are no comments",
+			name: "updating last comment with non-interactive web errors because there are no comments",
 			input: &shared.CommentableOptions{
 				Interactive: false,
 				InputType:   shared.InputTypeWeb,
@@ -352,7 +352,7 @@ func Test_commentRun(t *testing.T) {
 			wantsErr:      true,
 		},
 		{
-			name: "creating new PR comment with non-interactive editor succeeds",
+			name: "creating new comment with non-interactive editor succeeds",
 			input: &shared.CommentableOptions{
 				Interactive: false,
 				InputType:   shared.InputTypeEditor,
@@ -366,7 +366,7 @@ func Test_commentRun(t *testing.T) {
 			stdout: "https://github.com/OWNER/REPO/pull/123#issuecomment-456\n",
 		},
 		{
-			name: "updating last PR comment with non-interactive editor fails if there are no comments",
+			name: "updating last comment with non-interactive editor fails if there are no comments",
 			input: &shared.CommentableOptions{
 				Interactive: false,
 				InputType:   shared.InputTypeEditor,
@@ -379,7 +379,7 @@ func Test_commentRun(t *testing.T) {
 			wantsErr:      true,
 		},
 		{
-			name: "updating last PR comment with non-interactive editor succeeds if there are comments",
+			name: "updating last comment with non-interactive editor succeeds if there are comments",
 			input: &shared.CommentableOptions{
 				Interactive: false,
 				InputType:   shared.InputTypeEditor,
@@ -394,7 +394,7 @@ func Test_commentRun(t *testing.T) {
 			stdout: "https://github.com/OWNER/REPO/pull/123#issuecomment-111\n",
 		},
 		{
-			name: "updating last PR comment with non-interactive editor creates new comment if there are no comments but --create-if-none",
+			name: "updating last comment with non-interactive editor creates new comment if there are no comments but --create-if-none",
 			input: &shared.CommentableOptions{
 				Interactive:  false,
 				InputType:    shared.InputTypeEditor,
@@ -411,7 +411,7 @@ func Test_commentRun(t *testing.T) {
 			stdout: "https://github.com/OWNER/REPO/pull/123#issuecomment-456\n",
 		},
 		{
-			name: "creating new PR comment with non-interactive inline succeeds if comment body is provided",
+			name: "creating new comment with non-interactive inline succeeds if comment body is provided",
 			input: &shared.CommentableOptions{
 				Interactive: false,
 				InputType:   shared.InputTypeInline,
@@ -423,7 +423,7 @@ func Test_commentRun(t *testing.T) {
 			stdout: "https://github.com/OWNER/REPO/pull/123#issuecomment-456\n",
 		},
 		{
-			name: "updating last PR comment with non-interactive inline succeeds if there are comments and comment body is provided",
+			name: "updating last comment with non-interactive inline succeeds if there are comments and comment body is provided",
 			input: &shared.CommentableOptions{
 				Interactive: false,
 				InputType:   shared.InputTypeInline,
@@ -437,7 +437,7 @@ func Test_commentRun(t *testing.T) {
 			stdout:        "https://github.com/OWNER/REPO/pull/123#issuecomment-111\n",
 		},
 		{
-			name: "updating last PR comment with non-interactive inline creates new comment if there are no comments but --create-if-none",
+			name: "updating last comment with non-interactive inline creates new comment if there are no comments but --create-if-none",
 			input: &shared.CommentableOptions{
 				Interactive:  false,
 				InputType:    shared.InputTypeInline,