diff --git a/x-pack/plugins/cases/common/api/cases/case.ts b/x-pack/plugins/cases/common/api/cases/case.ts
index 17319a71732e1..fb77d5f4a95d2 100644
--- a/x-pack/plugins/cases/common/api/cases/case.ts
+++ b/x-pack/plugins/cases/common/api/cases/case.ts
@@ -9,7 +9,7 @@ import * as rt from 'io-ts';
 
 import { NumberFromString } from '../saved_object';
 import { UserRt } from '../user';
-import { CommentResponseRt } from './comment';
+import { CommentRt } from './comment';
 import { CasesStatusResponseRt, CaseStatusRt } from './status';
 import { CaseConnectorRt } from '../connectors/connector';
 import { CaseAssigneesRt } from './assignee';
@@ -258,7 +258,7 @@ export const CaseRt = rt.intersection([
     version: rt.string,
   }),
   rt.partial({
-    comments: rt.array(CommentResponseRt),
+    comments: rt.array(CommentRt),
   }),
 ]);
 
diff --git a/x-pack/plugins/cases/common/api/cases/comment/index.ts b/x-pack/plugins/cases/common/api/cases/comment/index.ts
index 7729673410a71..b6b35e7cc73b5 100644
--- a/x-pack/plugins/cases/common/api/cases/comment/index.ts
+++ b/x-pack/plugins/cases/common/api/cases/comment/index.ts
@@ -185,7 +185,7 @@ export const CommentRequestRt = rt.union([
   PersistableStateAttachmentRt,
 ]);
 
-export const CommentResponseRt = rt.intersection([
+export const CommentRt = rt.intersection([
   CommentAttributesRt,
   rt.type({
     id: rt.string,
@@ -233,8 +233,6 @@ export const CommentResponseTypePersistableStateRt = rt.intersection([
   }),
 ]);
 
-export const AllCommentsResponseRT = rt.array(CommentResponseRt);
-
 export const CommentPatchRequestRt = rt.intersection([
   /**
    * Partial updates are not allowed.
@@ -266,14 +264,14 @@ export const CommentPatchAttributesRt = rt.intersection([
   rt.partial(CommentAttributesBasicRt.props),
 ]);
 
-export const CommentsResponseRt = rt.type({
-  comments: rt.array(CommentResponseRt),
+export const CommentsFindResponseRt = rt.type({
+  comments: rt.array(CommentRt),
   page: rt.number,
   per_page: rt.number,
   total: rt.number,
 });
 
-export const AllCommentsResponseRt = rt.array(CommentResponseRt);
+export const CommentsRt = rt.array(CommentRt);
 
 export const FindQueryParamsRt = rt.partial({
   ...SavedObjectFindOptionsRt.props,
@@ -286,7 +284,7 @@ export const BulkGetAttachmentsRequestRt = rt.type({
 });
 
 export const BulkGetAttachmentsResponseRt = rt.type({
-  attachments: AllCommentsResponseRt,
+  attachments: CommentsRt,
   errors: rt.array(
     rt.type({
       error: rt.string,
@@ -314,7 +312,7 @@ export type CommentAttributesNoSO = rt.TypeOf<typeof CommentAttributesNoSORt>;
 export type CommentAttributesWithoutRefs = rt.TypeOf<typeof CommentAttributesWithoutRefsRt>;
 export type CommentRequest = rt.TypeOf<typeof CommentRequestRt>;
 export type BulkCreateCommentRequest = rt.TypeOf<typeof BulkCreateCommentRequestRt>;
-export type CommentResponse = rt.TypeOf<typeof CommentResponseRt>;
+export type Comment = rt.TypeOf<typeof CommentRt>;
 export type CommentResponseUserType = rt.TypeOf<typeof CommentResponseTypeUserRt>;
 export type CommentResponseAlertsType = rt.TypeOf<typeof CommentResponseTypeAlertsRt>;
 export type CommentResponseTypePersistableState = rt.TypeOf<
@@ -324,8 +322,8 @@ export type CommentResponseExternalReferenceType = rt.TypeOf<
   typeof CommentResponseTypeExternalReferenceRt
 >;
 export type CommentResponseActionsType = rt.TypeOf<typeof CommentResponseTypeActionsRt>;
-export type AllCommentsResponse = rt.TypeOf<typeof AllCommentsResponseRt>;
-export type CommentsResponse = rt.TypeOf<typeof CommentsResponseRt>;
+export type Comments = rt.TypeOf<typeof CommentsRt>;
+export type CommentsFindResponse = rt.TypeOf<typeof CommentsFindResponseRt>;
 export type CommentPatchRequest = rt.TypeOf<typeof CommentPatchRequestRt>;
 export type CommentPatchAttributes = rt.TypeOf<typeof CommentPatchAttributesRt>;
 export type CommentRequestUserType = rt.TypeOf<typeof ContextTypeUserRt>;
diff --git a/x-pack/plugins/cases/common/ui/types.ts b/x-pack/plugins/cases/common/ui/types.ts
index c8a1e2172651f..343c95956a913 100644
--- a/x-pack/plugins/cases/common/ui/types.ts
+++ b/x-pack/plugins/cases/common/ui/types.ts
@@ -19,7 +19,7 @@ import type {
   ActionConnector,
   UserAction,
   SingleCaseMetricsResponse,
-  CommentResponse,
+  Comment,
   Case as CaseSnakeCase,
   UserActionFindResponse,
   FindTypeField as UserActionFindTypeField,
@@ -83,7 +83,7 @@ export type CaseViewRefreshPropInterface = null | {
   refreshCase: () => Promise<void>;
 };
 
-export type Comment = SnakeToCamelCase<CommentResponse>;
+export type CommentUI = SnakeToCamelCase<Comment>;
 export type AlertComment = SnakeToCamelCase<CommentResponseAlertsType>;
 export type ExternalReferenceComment = SnakeToCamelCase<CommentResponseExternalReferenceType>;
 export type PersistableComment = SnakeToCamelCase<CommentResponseTypePersistableState>;
@@ -92,7 +92,7 @@ export type FindCaseUserActions = Omit<SnakeToCamelCase<UserActionFindResponse>,
   userActions: UserActionUI[];
 };
 export type CaseUserActionsStats = SnakeToCamelCase<CaseUserActionStatsResponse>;
-export type CaseUI = Omit<SnakeToCamelCase<CaseSnakeCase>, 'comments'> & { comments: Comment[] };
+export type CaseUI = Omit<SnakeToCamelCase<CaseSnakeCase>, 'comments'> & { comments: CommentUI[] };
 export type CasesUI = Omit<SnakeToCamelCase<CasesFindResponse>, 'cases'> & { cases: CaseUI[] };
 export type CasesStatus = SnakeToCamelCase<CasesStatusResponse>;
 export type CasesMetrics = SnakeToCamelCase<CasesMetricsResponse>;
diff --git a/x-pack/plugins/cases/public/api/utils.ts b/x-pack/plugins/cases/public/api/utils.ts
index 4f2dde86dfec1..904205ff4308c 100644
--- a/x-pack/plugins/cases/public/api/utils.ts
+++ b/x-pack/plugins/cases/public/api/utils.ts
@@ -16,12 +16,12 @@ import type {
   Case,
   UserActions,
   CommentRequest,
-  CommentResponse,
+  Comment,
   CaseResolveResponse,
   Cases,
 } from '../../common/api';
 import { isCommentUserAction } from '../../common/utils/user_actions';
-import type { CasesUI, CaseUI, Comment, ResolvedCase } from '../containers/types';
+import type { CasesUI, CaseUI, CommentUI, ResolvedCase } from '../containers/types';
 
 export const convertArrayToCamelCase = (arrayOfSnakes: unknown[]): unknown[] =>
   arrayOfSnakes.reduce((acc: unknown[], value) => {
@@ -65,11 +65,11 @@ export const convertCaseResolveToCamelCase = (res: CaseResolveResponse): Resolve
   };
 };
 
-export const convertAttachmentsToCamelCase = (attachments: CommentResponse[]): Comment[] => {
+export const convertAttachmentsToCamelCase = (attachments: Comment[]): CommentUI[] => {
   return attachments.map((attachment) => convertAttachmentToCamelCase(attachment));
 };
 
-export const convertAttachmentToCamelCase = (attachment: CommentRequest): Comment => {
+export const convertAttachmentToCamelCase = (attachment: CommentRequest): CommentUI => {
   if (isCommentRequestTypeExternalReference(attachment)) {
     return convertAttachmentToCamelExceptProperty(attachment, 'externalReferenceMetadata');
   }
@@ -78,7 +78,7 @@ export const convertAttachmentToCamelCase = (attachment: CommentRequest): Commen
     return convertAttachmentToCamelExceptProperty(attachment, 'persistableStateAttachmentState');
   }
 
-  return convertToCamelCase<CommentRequest, Comment>(attachment);
+  return convertToCamelCase<CommentRequest, CommentUI>(attachment);
 };
 
 export const convertUserActionsToCamelCase = (userActions: UserActions) => {
@@ -102,7 +102,7 @@ export const convertUserActionsToCamelCase = (userActions: UserActions) => {
 const convertAttachmentToCamelExceptProperty = (
   attachment: CommentRequest,
   key: string
-): Comment => {
+): CommentUI => {
   const intactValue = get(attachment, key);
   const attachmentWithoutIntactValue = omit(attachment, key);
   const camelCaseAttachmentWithoutIntactValue = convertToCamelCase(attachmentWithoutIntactValue);
@@ -110,7 +110,7 @@ const convertAttachmentToCamelExceptProperty = (
   return {
     ...camelCaseAttachmentWithoutIntactValue,
     [key]: intactValue,
-  } as Comment;
+  } as CommentUI;
 };
 
 export const convertAllCasesToCamel = (snakeCases: CasesFindResponse): CasesUI => ({
diff --git a/x-pack/plugins/cases/public/components/case_view/components/helpers.ts b/x-pack/plugins/cases/public/components/case_view/components/helpers.ts
index 0fb247dda5282..b3ddc403cc661 100644
--- a/x-pack/plugins/cases/public/components/case_view/components/helpers.ts
+++ b/x-pack/plugins/cases/public/components/case_view/components/helpers.ts
@@ -6,10 +6,10 @@
  */
 
 import { CommentType } from '../../../../common/api';
-import type { Comment } from '../../../containers/types';
+import type { CommentUI } from '../../../containers/types';
 
-export const getManualAlertIds = (comments: Comment[]): string[] => {
-  const dedupeAlerts = comments.reduce((alertIds, comment: Comment) => {
+export const getManualAlertIds = (comments: CommentUI[]): string[] => {
+  const dedupeAlerts = comments.reduce((alertIds, comment: CommentUI) => {
     if (comment.type === CommentType.alert) {
       const ids = Array.isArray(comment.alertId) ? comment.alertId : [comment.alertId];
       ids.forEach((id) => alertIds.add(id));
@@ -20,8 +20,8 @@ export const getManualAlertIds = (comments: Comment[]): string[] => {
   return Array.from(dedupeAlerts);
 };
 
-export const getRegistrationContextFromAlerts = (comments: Comment[]): string[] => {
-  const dedupeRegistrationContext = comments.reduce((registrationContexts, comment: Comment) => {
+export const getRegistrationContextFromAlerts = (comments: CommentUI[]): string[] => {
+  const dedupeRegistrationContext = comments.reduce((registrationContexts, comment: CommentUI) => {
     if (comment.type === CommentType.alert) {
       const indices = Array.isArray(comment.index) ? comment.index : [comment.index];
       indices.forEach((index) => {
diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/comment.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/comment.tsx
index 434a95cc69b1c..b4fbc12ea48e4 100644
--- a/x-pack/plugins/cases/public/components/user_actions/comment/comment.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/comment/comment.tsx
@@ -12,7 +12,7 @@ import type { CommentUserAction } from '../../../../common/api';
 import { Actions, CommentType } from '../../../../common/api';
 import type { UserActionBuilder, UserActionBuilderArgs, UserActionResponse } from '../types';
 import { createCommonUpdateUserActionBuilder } from '../common';
-import type { Comment } from '../../../containers/types';
+import type { CommentUI } from '../../../containers/types';
 import * as i18n from './translations';
 import { createUserAttachmentUserActionBuilder } from './user';
 import { createAlertAttachmentUserActionBuilder } from './alert';
@@ -164,7 +164,7 @@ const getCreateCommentUserAction = ({
   actionsNavigation,
 }: {
   userAction: UserActionResponse<CommentUserAction>;
-  comment: Comment;
+  comment: CommentUI;
 } & Omit<
   UserActionBuilderArgs,
   'comments' | 'index' | 'handleOutlineComment' | 'currentUserProfile'
diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/registered_attachments.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/registered_attachments.tsx
index 71457cb49e089..2aa419d8ece5c 100644
--- a/x-pack/plugins/cases/public/components/user_actions/comment/registered_attachments.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/comment/registered_attachments.tsx
@@ -24,7 +24,7 @@ import type {
 import { AttachmentActionType } from '../../../client/attachment_framework/types';
 import { UserActionTimestamp } from '../timestamp';
 import type { AttachmentTypeRegistry } from '../../../../common/registry';
-import type { CommentResponse } from '../../../../common/api';
+import type { Comment } from '../../../../common/api';
 import type { UserActionBuilder, UserActionBuilderArgs } from '../types';
 import type { SnakeToCamelCase } from '../../../../common/types';
 import {
@@ -69,7 +69,7 @@ const getAttachmentRenderer = memoize(() => {
 });
 
 export const createRegisteredAttachmentUserActionBuilder = <
-  C extends CommentResponse,
+  C extends Comment,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   R extends AttachmentTypeRegistry<AttachmentType<any>>
 >({
diff --git a/x-pack/plugins/cases/public/components/user_actions/helpers.test.ts b/x-pack/plugins/cases/public/components/user_actions/helpers.test.ts
index bd1873a591bee..0e84b9463694b 100644
--- a/x-pack/plugins/cases/public/components/user_actions/helpers.test.ts
+++ b/x-pack/plugins/cases/public/components/user_actions/helpers.test.ts
@@ -7,10 +7,10 @@
 
 import { CommentType } from '../../../common/api';
 import { SECURITY_SOLUTION_OWNER } from '../../../common/constants';
-import type { Comment } from '../../containers/types';
+import type { CommentUI } from '../../containers/types';
 import { isUserActionTypeSupported, getManualAlertIdsWithNoRuleId } from './helpers';
 
-const comments: Comment[] = [
+const comments: CommentUI[] = [
   {
     type: CommentType.alert,
     alertId: 'alert-id-1',
diff --git a/x-pack/plugins/cases/public/components/user_actions/helpers.ts b/x-pack/plugins/cases/public/components/user_actions/helpers.ts
index fe9e5b2bb5cff..a3bd67bd6e655 100644
--- a/x-pack/plugins/cases/public/components/user_actions/helpers.ts
+++ b/x-pack/plugins/cases/public/components/user_actions/helpers.ts
@@ -8,15 +8,15 @@
 import { isEmpty } from 'lodash';
 
 import { CommentType } from '../../../common/api';
-import type { Comment } from '../../containers/types';
+import type { CommentUI } from '../../containers/types';
 import { SUPPORTED_ACTION_TYPES } from './constants';
 import type { SupportedUserActionTypes } from './types';
 
 export const isUserActionTypeSupported = (type: string): type is SupportedUserActionTypes =>
   SUPPORTED_ACTION_TYPES.includes(type as SupportedUserActionTypes);
 
-export const getManualAlertIdsWithNoRuleId = (comments: Comment[]): string[] => {
-  const dedupeAlerts = comments.reduce((alertIds, comment: Comment) => {
+export const getManualAlertIdsWithNoRuleId = (comments: CommentUI[]): string[] => {
+  const dedupeAlerts = comments.reduce((alertIds, comment: CommentUI) => {
     if (comment.type === CommentType.alert && isEmpty(comment.rule.id)) {
       const ids = Array.isArray(comment.alertId) ? comment.alertId : [comment.alertId];
       ids.forEach((id) => alertIds.add(id));
diff --git a/x-pack/plugins/cases/public/components/user_actions/types.ts b/x-pack/plugins/cases/public/components/user_actions/types.ts
index 4e2660734052f..1e36ea22e2033 100644
--- a/x-pack/plugins/cases/public/components/user_actions/types.ts
+++ b/x-pack/plugins/cases/public/components/user_actions/types.ts
@@ -13,7 +13,7 @@ import type {
   CaseUI,
   CaseConnectors,
   UserActionUI,
-  Comment,
+  CommentUI,
   UseFetchAlertData,
   CaseUserActionsStats,
 } from '../../containers/types';
@@ -55,7 +55,7 @@ export interface UserActionBuilderArgs {
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry;
   caseConnectors: CaseConnectors;
   userAction: UserActionUI;
-  comments: Comment[];
+  comments: CommentUI[];
   index: number;
   commentRefs: React.MutableRefObject<
     Record<string, AddCommentRefObject | UserActionMarkdownRefObject | null | undefined>
diff --git a/x-pack/plugins/cases/public/containers/mock.ts b/x-pack/plugins/cases/public/containers/mock.ts
index d35d001d41bc4..ba8724637038a 100644
--- a/x-pack/plugins/cases/public/containers/mock.ts
+++ b/x-pack/plugins/cases/public/containers/mock.ts
@@ -6,7 +6,7 @@
  */
 import type { FileJSON } from '@kbn/shared-ux-file-types';
 
-import type { ActionLicense, CasesUI, CaseUI, CasesStatus, UserActionUI, Comment } from './types';
+import type { ActionLicense, CasesUI, CaseUI, CasesStatus, UserActionUI, CommentUI } from './types';
 
 import type {
   ResolvedCase,
@@ -28,7 +28,7 @@ import type {
   CasesStatusResponse,
   UserAction,
   UserActions,
-  CommentResponse,
+  Comment,
   ActionCategory,
   UserActionTypes,
   UserActionWithResponse,
@@ -73,7 +73,7 @@ export const elasticUser = {
 
 export const tags: string[] = ['coke', 'pepsi'];
 
-export const basicComment: Comment = {
+export const basicComment: CommentUI = {
   comment: 'Solve this fast!',
   type: CommentType.user,
   id: basicCommentId,
@@ -125,7 +125,7 @@ export const alertCommentWithIndices: AlertComment = {
   version: 'WzQ3LDFc',
 };
 
-export const hostIsolationComment = (overrides?: Record<string, unknown>): Comment => {
+export const hostIsolationComment = (overrides?: Record<string, unknown>): CommentUI => {
   return {
     type: CommentType.actions,
     comment: 'I just isolated the host!',
@@ -151,7 +151,7 @@ export const hostIsolationComment = (overrides?: Record<string, unknown>): Comme
   };
 };
 
-export const hostReleaseComment: () => Comment = () => {
+export const hostReleaseComment: () => CommentUI = () => {
   return {
     type: CommentType.actions,
     comment: 'I just released the host!',
@@ -363,7 +363,7 @@ export const basicCasePost: CaseUI = {
   updatedBy: null,
 };
 
-export const basicCommentPatch: Comment = {
+export const basicCommentPatch: CommentUI = {
   ...basicComment,
   updatedAt: basicUpdatedAt,
   updatedBy: {
@@ -469,7 +469,7 @@ export const elasticUserSnake = {
   email: 'leslie.knope@elastic.co',
 };
 
-export const basicCommentSnake: CommentResponse = {
+export const basicCommentSnake: Comment = {
   comment: 'Solve this fast!',
   type: CommentType.user,
   id: basicCommentId,
@@ -483,7 +483,7 @@ export const basicCommentSnake: CommentResponse = {
   version: 'WzQ3LDFc',
 };
 
-export const externalReferenceAttachmentSnake: CommentResponse = {
+export const externalReferenceAttachmentSnake: Comment = {
   type: CommentType.externalReference,
   id: 'external-reference-comment-id',
   externalReferenceId: 'my-id',
@@ -500,7 +500,7 @@ export const externalReferenceAttachmentSnake: CommentResponse = {
   version: 'WzQ3LDFc',
 };
 
-export const persistableStateAttachmentSnake: CommentResponse = {
+export const persistableStateAttachmentSnake: Comment = {
   type: CommentType.persistableState,
   id: 'persistable-state-comment-id',
   persistableStateAttachmentState: { test_foo: 'foo' },
diff --git a/x-pack/plugins/cases/server/client/attachments/client.ts b/x-pack/plugins/cases/server/client/attachments/client.ts
index e4244b32d1e7d..987e3c17575e3 100644
--- a/x-pack/plugins/cases/server/client/attachments/client.ts
+++ b/x-pack/plugins/cases/server/client/attachments/client.ts
@@ -7,11 +7,11 @@
 
 import type {
   AlertResponse,
-  AllCommentsResponse,
+  Comments,
   BulkGetAttachmentsResponse,
   Case,
-  CommentResponse,
-  CommentsResponse,
+  Comment,
+  CommentsFindResponse,
 } from '../../../common/api';
 import type { CasesClient } from '../client';
 
@@ -60,7 +60,7 @@ export interface AttachmentsSubClient {
   /**
    * Retrieves all comments matching the search criteria.
    */
-  find(findArgs: FindArgs): Promise<CommentsResponse>;
+  find(findArgs: FindArgs): Promise<CommentsFindResponse>;
   /**
    * Retrieves all alerts attach to a case given a single case ID
    */
@@ -68,11 +68,11 @@ export interface AttachmentsSubClient {
   /**
    * Gets all attachments for a single case.
    */
-  getAll(getAllArgs: GetAllArgs): Promise<AllCommentsResponse>;
+  getAll(getAllArgs: GetAllArgs): Promise<Comments>;
   /**
    * Retrieves a single attachment for a case.
    */
-  get(getArgs: GetArgs): Promise<CommentResponse>;
+  get(getArgs: GetArgs): Promise<Comment>;
   /**
    * Updates a specific attachment.
    *
diff --git a/x-pack/plugins/cases/server/client/attachments/get.ts b/x-pack/plugins/cases/server/client/attachments/get.ts
index 91160e857c5cf..79832e98c8016 100644
--- a/x-pack/plugins/cases/server/client/attachments/get.ts
+++ b/x-pack/plugins/cases/server/client/attachments/get.ts
@@ -8,12 +8,12 @@ import type { SavedObject } from '@kbn/core/server';
 
 import type {
   AlertResponse,
-  AllCommentsResponse,
+  Comments,
   AttributesTypeAlerts,
-  CommentResponse,
-  CommentsResponse,
+  Comment,
+  CommentsFindResponse,
 } from '../../../common/api';
-import { AllCommentsResponseRt, CommentResponseRt, CommentsResponseRt } from '../../../common/api';
+import { CommentsRt, CommentRt, CommentsFindResponseRt } from '../../../common/api';
 import {
   defaultSortField,
   transformComments,
@@ -100,7 +100,7 @@ export const getAllAlertsAttachToCase = async (
 export async function find(
   { caseID, queryParams }: FindArgs,
   clientArgs: CasesClientArgs
-): Promise<CommentsResponse> {
+): Promise<CommentsFindResponse> {
   const {
     unsecuredSavedObjectsClient,
     services: { caseService },
@@ -159,7 +159,7 @@ export async function find(
       }))
     );
 
-    return CommentsResponseRt.encode(transformComments(theComments));
+    return CommentsFindResponseRt.encode(transformComments(theComments));
   } catch (error) {
     throw createCaseError({
       message: `Failed to find comments case id: ${caseID}: ${error}`,
@@ -175,7 +175,7 @@ export async function find(
 export async function get(
   { attachmentID, caseID }: GetArgs,
   clientArgs: CasesClientArgs
-): Promise<CommentResponse> {
+): Promise<Comment> {
   const {
     services: { attachmentService },
     logger,
@@ -192,7 +192,7 @@ export async function get(
       operation: Operations.getComment,
     });
 
-    return CommentResponseRt.encode(flattenCommentSavedObject(comment));
+    return CommentRt.encode(flattenCommentSavedObject(comment));
   } catch (error) {
     throw createCaseError({
       message: `Failed to get comment case id: ${caseID} attachment id: ${attachmentID}: ${error}`,
@@ -208,7 +208,7 @@ export async function get(
 export async function getAll(
   { caseID }: GetAllArgs,
   clientArgs: CasesClientArgs
-): Promise<AllCommentsResponse> {
+): Promise<Comments> {
   const {
     services: { caseService },
     logger,
@@ -232,7 +232,7 @@ export async function getAll(
       comments.saved_objects.map((comment) => ({ id: comment.id, owner: comment.attributes.owner }))
     );
 
-    return AllCommentsResponseRt.encode(flattenCommentSavedObjects(comments.saved_objects));
+    return CommentsRt.encode(flattenCommentSavedObjects(comments.saved_objects));
   } catch (error) {
     throw createCaseError({
       message: `Failed to get all comments case id: ${caseID}: ${error}`,
diff --git a/x-pack/plugins/cases/server/client/cases/mock.ts b/x-pack/plugins/cases/server/client/cases/mock.ts
index 48ece730f3ead..527c517e4a79e 100644
--- a/x-pack/plugins/cases/server/client/cases/mock.ts
+++ b/x-pack/plugins/cases/server/client/cases/mock.ts
@@ -6,7 +6,7 @@
  */
 
 import type {
-  CommentResponse,
+  Comment,
   CommentResponseAlertsType,
   ConnectorMappingsAttributes,
   CaseUserActionsDeprecatedResponse,
@@ -31,7 +31,7 @@ const entity = {
   updatedBy: null,
 };
 
-export const comment: CommentResponse = {
+export const comment: Comment = {
   id: 'comment-user-1',
   comment: 'Wow, good luck catching that bad meanie!',
   type: CommentType.user as const,
@@ -53,7 +53,7 @@ export const comment: CommentResponse = {
   version: 'WzEsMV0=',
 };
 
-export const isolateCommentActions: CommentResponse = {
+export const isolateCommentActions: Comment = {
   id: 'mock-action-comment-1',
   comment: 'Isolating this for investigation',
   type: CommentType.actions as const,
@@ -84,7 +84,7 @@ export const isolateCommentActions: CommentResponse = {
   version: 'WzEsMV0=',
 };
 
-export const releaseCommentActions: CommentResponse = {
+export const releaseCommentActions: Comment = {
   id: 'mock-action-comment-2',
   comment: 'Releasing this for investigation',
   type: CommentType.actions as const,
@@ -115,7 +115,7 @@ export const releaseCommentActions: CommentResponse = {
   version: 'WzEsMV0=',
 };
 
-export const isolateCommentActionsMultipleTargets: CommentResponse = {
+export const isolateCommentActionsMultipleTargets: Comment = {
   id: 'mock-action-comment-3',
   comment: 'Isolating this for investigation',
   type: CommentType.actions as const,
@@ -150,7 +150,7 @@ export const isolateCommentActionsMultipleTargets: CommentResponse = {
   version: 'WzEsMV0=',
 };
 
-export const commentAlert: CommentResponse = {
+export const commentAlert: Comment = {
   id: 'comment-alert-1',
   alertId: 'alert-id-1',
   index: 'alert-index-1',
@@ -186,7 +186,7 @@ export const commentAlertMultipleIds: CommentResponseAlertsType = {
   owner: SECURITY_SOLUTION_OWNER,
 };
 
-export const commentExternalReference: CommentResponse = {
+export const commentExternalReference: Comment = {
   id: 'comment-external-reference-1',
   type: CommentType.externalReference as const,
   externalReferenceId: 'my-id',
@@ -213,7 +213,7 @@ export const commentExternalReference: CommentResponse = {
   version: 'WzEsMV0=',
 };
 
-export const commentPersistableState: CommentResponse = {
+export const commentPersistableState: Comment = {
   id: 'comment-persistable-state-1',
   type: CommentType.persistableState,
   persistableStateAttachmentTypeId: '.test',
diff --git a/x-pack/plugins/cases/server/client/cases/utils.ts b/x-pack/plugins/cases/server/client/cases/utils.ts
index ecf5aaf441447..5b43b4ae68766 100644
--- a/x-pack/plugins/cases/server/client/cases/utils.ts
+++ b/x-pack/plugins/cases/server/client/cases/utils.ts
@@ -16,7 +16,7 @@ import type {
   ActionConnector,
   CaseFullExternalService,
   Case,
-  CommentResponse,
+  Comment,
   User,
   CaseAttributes,
   CaseAssignees,
@@ -77,7 +77,7 @@ export const getLatestPushInfo = (
   return null;
 };
 
-const getCommentContent = (comment: CommentResponse): string => {
+const getCommentContent = (comment: Comment): string => {
   if (comment.type === CommentType.user) {
     return comment.comment;
   } else if (comment.type === CommentType.alert) {
diff --git a/x-pack/plugins/cases/server/client/typedoc_interfaces.ts b/x-pack/plugins/cases/server/client/typedoc_interfaces.ts
index f0fe44d4d44da..76ff974f2c583 100644
--- a/x-pack/plugins/cases/server/client/typedoc_interfaces.ts
+++ b/x-pack/plugins/cases/server/client/typedoc_interfaces.ts
@@ -14,7 +14,7 @@
 /* eslint-disable @typescript-eslint/no-empty-interface */
 
 import type {
-  AllCommentsResponse,
+  Comments,
   CasePostRequest,
   CaseResolveResponse,
   Case,
@@ -26,7 +26,7 @@ import type {
   CasesPatchRequest,
   Cases,
   UserActions,
-  CommentsResponse,
+  CommentsFindResponse,
   CasesBulkGetResponse,
 } from '../../common/api';
 
@@ -48,7 +48,7 @@ export interface ICasesConfigureResponse extends CasesConfigureResponse {}
 export interface ICasesConfigureRequest extends CasesConfigureRequest {}
 export interface ICasesConfigurePatch extends CasesConfigurePatch {}
 
-export interface ICommentsResponse extends CommentsResponse {}
-export interface IAllCommentsResponse extends AllCommentsResponse {}
+export interface ICommentsResponse extends CommentsFindResponse {}
+export interface IAllCommentsResponse extends Comments {}
 
 export interface ICaseUserActionsResponse extends UserActions {}
diff --git a/x-pack/plugins/cases/server/common/types/attachments.ts b/x-pack/plugins/cases/server/common/types/attachments.ts
index 55b9990c5fb12..c48f250999a97 100644
--- a/x-pack/plugins/cases/server/common/types/attachments.ts
+++ b/x-pack/plugins/cases/server/common/types/attachments.ts
@@ -5,7 +5,9 @@
  * 2.0.
  */
 
+import type { SavedObject } from '@kbn/core/server';
 import type { JsonValue } from '@kbn/utility-types';
+import type { CommentAttributes } from '../../../common/api';
 import type { User } from './user';
 
 interface AttachmentCommonPersistedAttributes {
@@ -46,3 +48,6 @@ export interface AttachmentRequestAttributes {
 
 export type AttachmentPersistedAttributes = AttachmentRequestAttributes &
   AttachmentCommonPersistedAttributes;
+
+export type AttachmentTransformedAttributes = CommentAttributes;
+export type AttachmentSavedObjectTransformed = SavedObject<AttachmentTransformedAttributes>;
diff --git a/x-pack/plugins/cases/server/common/utils.ts b/x-pack/plugins/cases/server/common/utils.ts
index b04c9fd596503..75ca980af639b 100644
--- a/x-pack/plugins/cases/server/common/utils.ts
+++ b/x-pack/plugins/cases/server/common/utils.ts
@@ -35,8 +35,8 @@ import type {
   CommentRequestActionsType,
   CommentRequestAlertType,
   CommentRequestUserType,
-  CommentResponse,
-  CommentsResponse,
+  Comment,
+  CommentsFindResponse,
   User,
 } from '../../common/api';
 import {
@@ -133,7 +133,7 @@ export const flattenCaseSavedObject = ({
 
 export const transformComments = (
   comments: SavedObjectsFindResponse<CommentAttributes>
-): CommentsResponse => ({
+): CommentsFindResponse => ({
   page: comments.page,
   per_page: comments.per_page,
   total: comments.total,
@@ -142,14 +142,14 @@ export const transformComments = (
 
 export const flattenCommentSavedObjects = (
   savedObjects: Array<SavedObject<CommentAttributes>>
-): CommentResponse[] =>
-  savedObjects.reduce((acc: CommentResponse[], savedObject: SavedObject<CommentAttributes>) => {
+): Comment[] =>
+  savedObjects.reduce((acc: Comment[], savedObject: SavedObject<CommentAttributes>) => {
     return [...acc, flattenCommentSavedObject(savedObject)];
   }, []);
 
 export const flattenCommentSavedObject = (
   savedObject: SavedObject<CommentAttributes>
-): CommentResponse => ({
+): Comment => ({
   id: savedObject.id,
   version: savedObject.version ?? '0',
   ...savedObject.attributes,
diff --git a/x-pack/plugins/cases/server/services/attachments/index.ts b/x-pack/plugins/cases/server/services/attachments/index.ts
index e76b93ce0e5b9..7fead24a65162 100644
--- a/x-pack/plugins/cases/server/services/attachments/index.ts
+++ b/x-pack/plugins/cases/server/services/attachments/index.ts
@@ -6,7 +6,6 @@
  */
 
 import type {
-  SavedObject,
   SavedObjectsBulkResponse,
   SavedObjectsBulkUpdateResponse,
   SavedObjectsFindResponse,
@@ -14,7 +13,6 @@ import type {
 } from '@kbn/core/server';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { CommentAttributes as AttachmentAttributes } from '../../../common/api';
 import { CommentType } from '../../../common/api';
 import { CASE_COMMENT_SAVED_OBJECT, CASE_SAVED_OBJECT } from '../../../common/constants';
 import { buildFilter, combineFilters } from '../../client/utils';
@@ -38,7 +36,11 @@ import type {
   UpdateAttachmentArgs,
 } from './types';
 import { AttachmentGetter } from './operations/get';
-import type { AttachmentPersistedAttributes } from '../../common/types/attachments';
+import type {
+  AttachmentPersistedAttributes,
+  AttachmentTransformedAttributes,
+  AttachmentSavedObjectTransformed,
+} from '../../common/types/attachments';
 
 export class AttachmentService {
   private readonly _getter: AttachmentGetter;
@@ -155,7 +157,7 @@ export class AttachmentService {
     references,
     id,
     refresh,
-  }: CreateAttachmentArgs): Promise<SavedObject<AttachmentAttributes>> {
+  }: CreateAttachmentArgs): Promise<AttachmentSavedObjectTransformed> {
     try {
       this.context.log.debug(`Attempting to POST a new comment`);
 
@@ -190,7 +192,7 @@ export class AttachmentService {
   public async bulkCreate({
     attachments,
     refresh,
-  }: BulkCreateAttachments): Promise<SavedObjectsBulkResponse<AttachmentAttributes>> {
+  }: BulkCreateAttachments): Promise<SavedObjectsBulkResponse<AttachmentTransformedAttributes>> {
     try {
       this.context.log.debug(`Attempting to bulk create attachments`);
       const res =
@@ -231,7 +233,7 @@ export class AttachmentService {
     attachmentId,
     updatedAttributes,
     options,
-  }: UpdateAttachmentArgs): Promise<SavedObjectsUpdateResponse<AttachmentAttributes>> {
+  }: UpdateAttachmentArgs): Promise<SavedObjectsUpdateResponse<AttachmentTransformedAttributes>> {
     try {
       this.context.log.debug(`Attempting to UPDATE comment ${attachmentId}`);
 
@@ -278,7 +280,9 @@ export class AttachmentService {
   public async bulkUpdate({
     comments,
     refresh,
-  }: BulkUpdateAttachmentArgs): Promise<SavedObjectsBulkUpdateResponse<AttachmentAttributes>> {
+  }: BulkUpdateAttachmentArgs): Promise<
+    SavedObjectsBulkUpdateResponse<AttachmentTransformedAttributes>
+  > {
     try {
       this.context.log.debug(
         `Attempting to UPDATE comments ${comments.map((c) => c.attachmentId).join(', ')}`
@@ -336,7 +340,7 @@ export class AttachmentService {
     options,
   }: {
     options?: SavedObjectFindOptionsKueryNode;
-  }): Promise<SavedObjectsFindResponse<AttachmentAttributes>> {
+  }): Promise<SavedObjectsFindResponse<AttachmentTransformedAttributes>> {
     try {
       this.context.log.debug(`Attempting to find comments`);
       const res =
diff --git a/x-pack/plugins/cases/server/services/attachments/operations/get.ts b/x-pack/plugins/cases/server/services/attachments/operations/get.ts
index 4aa5c65ebdcc1..c5ba13633ab43 100644
--- a/x-pack/plugins/cases/server/services/attachments/operations/get.ts
+++ b/x-pack/plugins/cases/server/services/attachments/operations/get.ts
@@ -8,7 +8,11 @@
 import type { SavedObject } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { FILE_SO_TYPE } from '@kbn/files-plugin/common';
-import type { AttachmentPersistedAttributes } from '../../../common/types/attachments';
+import type {
+  AttachmentPersistedAttributes,
+  AttachmentTransformedAttributes,
+  AttachmentSavedObjectTransformed,
+} from '../../../common/types/attachments';
 import {
   CASE_COMMENT_SAVED_OBJECT,
   CASE_SAVED_OBJECT,
@@ -16,11 +20,7 @@ import {
   MAX_DOCS_PER_PAGE,
 } from '../../../../common/constants';
 import { buildFilter, combineFilters } from '../../../client/utils';
-import type {
-  AttachmentTotals,
-  AttributesTypeAlerts,
-  CommentAttributes as AttachmentAttributes,
-} from '../../../../common/api';
+import type { AttachmentTotals, AttributesTypeAlerts } from '../../../../common/api';
 import { CommentType } from '../../../../common/api';
 import type {
   AlertIdsAggsResult,
@@ -42,7 +42,7 @@ export class AttachmentGetter {
 
   public async bulkGet(
     attachmentIds: string[]
-  ): Promise<BulkOptionalAttributes<AttachmentAttributes>> {
+  ): Promise<BulkOptionalAttributes<AttachmentTransformedAttributes>> {
     try {
       this.context.log.debug(
         `Attempting to retrieve attachments with ids: ${attachmentIds.join()}`
@@ -190,9 +190,7 @@ export class AttachmentGetter {
     }
   }
 
-  public async get({
-    attachmentId,
-  }: GetAttachmentArgs): Promise<SavedObject<AttachmentAttributes>> {
+  public async get({ attachmentId }: GetAttachmentArgs): Promise<AttachmentSavedObjectTransformed> {
     try {
       this.context.log.debug(`Attempting to GET attachment ${attachmentId}`);
       const res = await this.context.unsecuredSavedObjectsClient.get<AttachmentPersistedAttributes>(
@@ -302,7 +300,7 @@ export class AttachmentGetter {
   }: {
     caseId: string;
     fileIds: string[];
-  }): Promise<Array<SavedObject<AttachmentAttributes>>> {
+  }): Promise<AttachmentSavedObjectTransformed[]> {
     try {
       this.context.log.debug('Attempting to find file attachments');
 
@@ -331,7 +329,7 @@ export class AttachmentGetter {
           }
         );
 
-      const foundAttachments: Array<SavedObject<AttachmentAttributes>> = [];
+      const foundAttachments: AttachmentSavedObjectTransformed[] = [];
 
       for await (const attachmentSavedObjects of finder.find()) {
         foundAttachments.push(
diff --git a/x-pack/plugins/cases/server/services/cases/index.ts b/x-pack/plugins/cases/server/services/cases/index.ts
index 93c6d610d5539..42fd0f03a25e2 100644
--- a/x-pack/plugins/cases/server/services/cases/index.ts
+++ b/x-pack/plugins/cases/server/services/cases/index.ts
@@ -27,7 +27,7 @@ import {
   CASE_SAVED_OBJECT,
   MAX_DOCS_PER_PAGE,
 } from '../../../common/constants';
-import type { Case, CommentAttributes, User, CaseStatuses } from '../../../common/api';
+import type { Case, User, CaseStatuses } from '../../../common/api';
 import { caseStatuses } from '../../../common/api';
 import type { SavedObjectFindOptionsKueryNode } from '../../common/types';
 import { defaultSortField, flattenCaseSavedObject } from '../../common/utils';
@@ -66,6 +66,7 @@ import type {
   PatchCaseArgs,
   PatchCasesArgs,
 } from './types';
+import type { AttachmentTransformedAttributes } from '../../common/types/attachments';
 
 export class CasesService {
   private readonly log: Logger;
@@ -343,7 +344,7 @@ export class CasesService {
   private async getAllComments({
     id,
     options,
-  }: FindCommentsArgs): Promise<SavedObjectsFindResponse<CommentAttributes>> {
+  }: FindCommentsArgs): Promise<SavedObjectsFindResponse<AttachmentTransformedAttributes>> {
     try {
       this.log.debug(`Attempting to GET all comments internal for id ${JSON.stringify(id)}`);
       if (options?.page !== undefined || options?.perPage !== undefined) {
@@ -378,7 +379,7 @@ export class CasesService {
   public async getAllCaseComments({
     id,
     options,
-  }: FindCaseCommentsArgs): Promise<SavedObjectsFindResponse<CommentAttributes>> {
+  }: FindCaseCommentsArgs): Promise<SavedObjectsFindResponse<AttachmentTransformedAttributes>> {
     try {
       const refs = this.asArray(id).map((caseID) => ({ type: CASE_SAVED_OBJECT, id: caseID }));
       if (refs.length <= 0) {
diff --git a/x-pack/plugins/cases/server/services/so_references.ts b/x-pack/plugins/cases/server/services/so_references.ts
index 8a3cc747c752a..24896b7601a5c 100644
--- a/x-pack/plugins/cases/server/services/so_references.ts
+++ b/x-pack/plugins/cases/server/services/so_references.ts
@@ -12,8 +12,8 @@ import type {
 } from '@kbn/core/server';
 import { isEqual, uniqWith } from 'lodash';
 import type {
-  CommentAttributesNoSO,
   CommentAttributes,
+  CommentAttributesNoSO,
   CommentPatchAttributes,
 } from '../../common/api';
 import type { PersistableStateAttachmentTypeRegistry } from '../attachment_framework/persistable_state_registry';
@@ -25,6 +25,8 @@ import { EXTERNAL_REFERENCE_REF_NAME } from '../common/constants';
 import type {
   AttachmentPersistedAttributes,
   AttachmentRequestAttributes,
+  AttachmentTransformedAttributes,
+  AttachmentSavedObjectTransformed,
 } from '../common/types/attachments';
 import { isCommentRequestTypeExternalReferenceSO } from './type_guards';
 import type { PartialField } from '../types';
@@ -56,11 +58,11 @@ type OptionalAttributes<T> = PartialField<SavedObject<T>, 'attributes'>;
 export const injectAttachmentAttributesAndHandleErrors = (
   savedObject: OptionalAttributes<AttachmentPersistedAttributes>,
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry
-): OptionalAttributes<CommentAttributes> => {
+): OptionalAttributes<AttachmentTransformedAttributes> => {
   if (!hasAttributes(savedObject)) {
     // we don't actually have an attributes field here so the type doesn't matter, this cast is to get the types to stop
     // complaining though
-    return savedObject as OptionalAttributes<CommentAttributes>;
+    return savedObject as OptionalAttributes<AttachmentTransformedAttributes>;
   }
 
   return injectAttachmentSOAttributesFromRefs(savedObject, persistableStateAttachmentTypeRegistry);
@@ -73,9 +75,9 @@ const hasAttributes = <T>(savedObject: OptionalAttributes<T>): savedObject is Sa
 export const injectAttachmentSOAttributesFromRefs = (
   savedObject: SavedObject<AttachmentPersistedAttributes>,
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry
-): SavedObject<CommentAttributes> => {
+): AttachmentSavedObjectTransformed => {
   const soExtractor = getAttachmentSOExtractor(savedObject.attributes);
-  const so = soExtractor.populateFieldsFromReferences<CommentAttributes>(savedObject);
+  const so = soExtractor.populateFieldsFromReferences<AttachmentTransformedAttributes>(savedObject);
   const injectedAttributes = injectPersistableReferencesToSO(so.attributes, so.references, {
     persistableStateAttachmentTypeRegistry,
   });
@@ -87,9 +89,9 @@ export const injectAttachmentSOAttributesFromRefsForPatch = (
   updatedAttributes: CommentPatchAttributes,
   savedObject: SavedObjectsUpdateResponse<AttachmentPersistedAttributes>,
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry
-): SavedObjectsUpdateResponse<CommentAttributes> => {
+): SavedObjectsUpdateResponse<AttachmentTransformedAttributes> => {
   const soExtractor = getAttachmentSOExtractor(savedObject.attributes);
-  const so = soExtractor.populateFieldsFromReferencesForPatch<CommentAttributes>({
+  const so = soExtractor.populateFieldsFromReferencesForPatch<AttachmentTransformedAttributes>({
     dataBeforeRequest: updatedAttributes,
     dataReturnedFromRequest: savedObject,
   });
@@ -105,7 +107,7 @@ export const injectAttachmentSOAttributesFromRefsForPatch = (
   return {
     ...so,
     attributes: { ...so.attributes, ...injectedAttributes },
-  } as SavedObjectsUpdateResponse<CommentAttributes>;
+  } as SavedObjectsUpdateResponse<AttachmentTransformedAttributes>;
 };
 
 interface ExtractionResults {
diff --git a/x-pack/test/cases_api_integration/common/lib/api/attachments.ts b/x-pack/test/cases_api_integration/common/lib/api/attachments.ts
index 944c2415ec38e..15e3901dcf970 100644
--- a/x-pack/test/cases_api_integration/common/lib/api/attachments.ts
+++ b/x-pack/test/cases_api_integration/common/lib/api/attachments.ts
@@ -8,14 +8,14 @@
 import type SuperTest from 'supertest';
 import { CASES_INTERNAL_URL, CASES_URL } from '@kbn/cases-plugin/common/constants';
 import {
-  AllCommentsResponse,
+  Comments,
   BulkCreateCommentRequest,
   BulkGetAttachmentsResponse,
   Case,
   CommentPatchRequest,
   CommentRequest,
-  CommentResponse,
-  CommentsResponse,
+  Comment,
+  CommentsFindResponse,
   CommentType,
   getCaseFindAttachmentsUrl,
   getCasesDeleteFileAttachmentsUrl,
@@ -203,7 +203,7 @@ export const getAllComments = async ({
   caseId: string;
   auth?: { user: User; space: string | null };
   expectedHttpCode?: number;
-}): Promise<AllCommentsResponse> => {
+}): Promise<Comments> => {
   const { body: comments } = await supertest
     .get(`${getSpaceUrlPrefix(auth.space)}${CASES_URL}/${caseId}/comments`)
     .auth(auth.user.username, auth.user.password)
@@ -224,7 +224,7 @@ export const getComment = async ({
   commentId: string;
   expectedHttpCode?: number;
   auth?: { user: User; space: string | null };
-}): Promise<CommentResponse> => {
+}): Promise<Comment> => {
   const { body: comment } = await supertest
     .get(`${getSpaceUrlPrefix(auth.space)}${CASES_URL}/${caseId}/comments/${commentId}`)
     .auth(auth.user.username, auth.user.password)
@@ -295,7 +295,7 @@ export const findAttachments = async ({
   query?: Record<string, unknown>;
   expectedHttpCode?: number;
   auth?: { user: User; space: string | null };
-}): Promise<CommentsResponse> => {
+}): Promise<CommentsFindResponse> => {
   const { body } = await supertest
     .get(`${getSpaceUrlPrefix(auth.space)}${getCaseFindAttachmentsUrl(caseId)}`)
     .set('kbn-xsrf', 'true')
diff --git a/x-pack/test/cases_api_integration/common/lib/api/omit.ts b/x-pack/test/cases_api_integration/common/lib/api/omit.ts
index 4f0b3402b847d..ea974f8357453 100644
--- a/x-pack/test/cases_api_integration/common/lib/api/omit.ts
+++ b/x-pack/test/cases_api_integration/common/lib/api/omit.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Case, CommentResponse } from '@kbn/cases-plugin/common/api';
+import { Case, Comment } from '@kbn/cases-plugin/common/api';
 import { omit } from 'lodash';
 
 interface CommonSavedObjectAttributes {
@@ -41,9 +41,9 @@ export const removeServerGeneratedPropertiesFromCase = (theCase: Case): Partial<
 };
 
 export const removeServerGeneratedPropertiesFromComments = (
-  comments: CommentResponse[] | undefined
-): Array<Partial<CommentResponse>> | undefined => {
+  comments: Comment[] | undefined
+): Array<Partial<Comment>> | undefined => {
   return comments?.map((comment) => {
-    return removeServerGeneratedPropertiesFromSavedObject<CommentResponse>(comment, []);
+    return removeServerGeneratedPropertiesFromSavedObject<Comment>(comment, []);
   });
 };
diff --git a/x-pack/test/cases_api_integration/common/lib/mock.ts b/x-pack/test/cases_api_integration/common/lib/mock.ts
index 8b8562e145395..16355aca51c76 100644
--- a/x-pack/test/cases_api_integration/common/lib/mock.ts
+++ b/x-pack/test/cases_api_integration/common/lib/mock.ts
@@ -9,7 +9,7 @@ import {
   CasePostRequest,
   Case,
   CasesFindResponse,
-  CommentResponse,
+  Comment,
   ConnectorTypes,
   CommentRequestUserType,
   CommentRequestAlertType,
@@ -185,7 +185,7 @@ export const commentsResp = ({
   comments,
 }: {
   comments: CommentRequestWithID[];
-}): Array<Partial<CommentResponse>> => {
+}): Array<Partial<Comment>> => {
   return comments.map(({ comment, id }) => {
     const baseFields = {
       id,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/import_export.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/import_export.ts
index b030b0ea5db4d..8d656de080556 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/import_export.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/import_export.ts
@@ -10,14 +10,12 @@ import { join } from 'path';
 import { SavedObject } from '@kbn/core/server';
 import supertest from 'supertest';
 import {
-  CASES_URL,
   CASE_SAVED_OBJECT,
   CASE_USER_ACTION_SAVED_OBJECT,
   CASE_COMMENT_SAVED_OBJECT,
 } from '@kbn/cases-plugin/common/constants';
 import {
   AttributesTypeUser,
-  CommentsResponse,
   CaseAttributes,
   CasePostRequest,
   PushedUserAction,
@@ -39,6 +37,7 @@ import {
   createComment,
   findCases,
   getCaseUserActions,
+  findAttachments,
 } from '../../../../common/lib/api';
 import { getPostCaseRequest, postCommentUserReq } from '../../../../common/lib/mock';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
@@ -102,10 +101,10 @@ export default ({ getService }: FtrProviderContext): void => {
       expect(findResponse.cases[0].title).to.eql('A case to export');
       expect(findResponse.cases[0].description).to.eql('a description');
 
-      const { body: commentsResponse }: { body: CommentsResponse } = await supertestService
-        .get(`${CASES_URL}/${findResponse.cases[0].id}/comments/_find`)
-        .send()
-        .expect(200);
+      const commentsResponse = await findAttachments({
+        supertest: supertestService,
+        caseId: findResponse.cases[0].id,
+      });
 
       const comment = commentsResponse.comments[0] as unknown as AttributesTypeUser;
       expect(comment.comment).to.eql('A comment for my case');
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/find_comments.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/find_comments.ts
index 7132972fb5b96..e7dac5f4c3fae 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/find_comments.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/find_comments.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 
 import { CASES_URL } from '@kbn/cases-plugin/common/constants';
-import { CommentsResponse } from '@kbn/cases-plugin/common/api';
+import { CommentsFindResponse } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   getPostCaseRequest,
@@ -26,6 +26,7 @@ import {
   getSpaceUrlPrefix,
   createCase,
   superUserSpace1Auth,
+  findAttachments,
 } from '../../../../common/lib/api';
 
 import {
@@ -221,10 +222,11 @@ export default ({ getService }: FtrProviderContext): void => {
             caseID: obsCase.id,
           },
         ]) {
-          const { body: caseComments }: { body: CommentsResponse } = await supertestWithoutAuth
-            .get(`${getSpaceUrlPrefix(space1)}${CASES_URL}/${scenario.caseID}/comments/_find`)
-            .auth(scenario.user.username, scenario.user.password)
-            .expect(200);
+          const caseComments = await findAttachments({
+            supertest: supertestWithoutAuth,
+            caseId: scenario.caseID,
+            auth: { user: scenario.user, space: space1 },
+          });
 
           ensureSavedObjectIsAuthorized(
             caseComments.comments,
@@ -279,7 +281,7 @@ export default ({ getService }: FtrProviderContext): void => {
           caseId: obsCase.id,
         });
 
-        const { body: res }: { body: CommentsResponse } = await supertestWithoutAuth
+        const { body: res }: { body: CommentsFindResponse } = await supertestWithoutAuth
           .get(
             `${getSpaceUrlPrefix('space1')}${CASES_URL}/${
               obsCase.id