diff --git a/apps/comments/src/components/Comment.vue b/apps/comments/src/components/Comment.vue
index 7b7fc4cdd46..41d3b3b7425 100644
--- a/apps/comments/src/components/Comment.vue
+++ b/apps/comments/src/components/Comment.vue
@@ -13,7 +13,7 @@
 			<!-- Author -->
 			<NcAvatar
 				class="comment__avatar"
-				:display-name="actorDisplayName"
+				:displayName="actorDisplayName"
 				:user="actorId"
 				:size="32" />
 		</div>
@@ -26,7 +26,7 @@
 				<NcActions v-if="isOwnComment && id && !loading" class="comment__actions">
 					<template v-if="!editing">
 						<NcActionButton
-							close-after-click
+							closeAfterClick
 							@click="onEdit">
 							<template #icon>
 								<IconPencilOutline :size="20" />
@@ -35,7 +35,7 @@
 						</NcActionButton>
 						<NcActionSeparator />
 						<NcActionButton
-							close-after-click
+							closeAfterClick
 							@click="onDeleteWithUndo">
 							<template #icon>
 								<IconTrashCanOutline :size="20" />
@@ -60,7 +60,7 @@
 					v-else-if="creationDateTime"
 					class="comment__timestamp"
 					:timestamp="timestamp"
-					:ignore-seconds="true" />
+					:ignoreSeconds="true" />
 			</div>
 
 			<!-- Message editor -->
@@ -68,14 +68,14 @@
 				<div class="comment__editor-group">
 					<NcRichContenteditable
 						ref="editor"
-						:auto-complete="autoComplete"
+						v-model="localMessage"
+						:autoComplete
 						:contenteditable="!loading"
 						:label="editor ? t('comments', 'New comment') : t('comments', 'Edit comment')"
 						:placeholder="t('comments', 'Write a comment …')"
-						:model-value="localMessage"
-						:user-data="userData"
+						:userData
 						aria-describedby="tab-comments__editor-description"
-						@update:model-value="updateLocalMessage"
+						@update:modelValue="submitted = false"
 						@submit="onSubmit" />
 					<div class="comment__submit">
 						<NcButton
@@ -103,7 +103,7 @@
 				:class="{ 'comment__message--expanded': expanded }"
 				:text="richContent.message"
 				:arguments="richContent.mentions"
-				use-markdown
+				useMarkdown
 				@click="onExpand" />
 		</div>
 	</component>
diff --git a/apps/comments/src/services/DeleteComment.ts b/apps/comments/src/services/DeleteComment.ts
index 46f46a483ff..dfbe874055a 100644
--- a/apps/comments/src/services/DeleteComment.ts
+++ b/apps/comments/src/services/DeleteComment.ts
@@ -8,11 +8,11 @@ import client from './DavClient.ts'
 /**
  * Delete a comment
  *
- * @param {string} resourceType the resource type
- * @param {number} resourceId the resource ID
- * @param {number} commentId the comment iD
+ * @param resourceType the resource type
+ * @param resourceId the resource ID
+ * @param commentId the comment iD
  */
-export default async function(resourceType, resourceId, commentId) {
+export default async function(resourceType: string, resourceId: number, commentId: number) {
 	const commentPath = ['', resourceType, resourceId, commentId].join('/')
 
 	// Fetch newly created comment data
diff --git a/apps/comments/src/services/EditComment.ts b/apps/comments/src/services/EditComment.ts
index c5f7679013b..4f62dd3ad7c 100644
--- a/apps/comments/src/services/EditComment.ts
+++ b/apps/comments/src/services/EditComment.ts
@@ -8,12 +8,12 @@ import client from './DavClient.ts'
 /**
  * Edit an existing comment
  *
- * @param {string} resourceType the resource type
- * @param {number} resourceId the resource ID
- * @param {number} commentId the comment iD
- * @param {string} message the message content
+ * @param resourceType the resource type
+ * @param resourceId the resource ID
+ * @param commentId the comment iD
+ * @param message the message content
  */
-export default async function(resourceType, resourceId, commentId, message) {
+export default async function(resourceType: string, resourceId: number, commentId: number, message: string) {
 	const commentPath = ['', resourceType, resourceId, commentId].join('/')
 
 	return await client.customRequest(commentPath, {
diff --git a/apps/comments/src/services/NewComment.ts b/apps/comments/src/services/NewComment.ts
index 32e452e2c20..9d4ab1d3cb2 100644
--- a/apps/comments/src/services/NewComment.ts
+++ b/apps/comments/src/services/NewComment.ts
@@ -12,17 +12,17 @@ import client from './DavClient.ts'
 /**
  * Retrieve the comments list
  *
- * @param {string} resourceType the resource type
- * @param {number} resourceId the resource ID
- * @param {string} message the message
- * @return {object} the new comment
+ * @param resourceType the resource type
+ * @param resourceId the resource ID
+ * @param message the message
+ * @return The new comment
  */
-export default async function(resourceType, resourceId, message) {
+export default async function(resourceType: string, resourceId: number, message: string) {
 	const resourcePath = ['', resourceType, resourceId].join('/')
 
 	const response = await axios.post(getRootPath() + resourcePath, {
-		actorDisplayName: getCurrentUser().displayName,
-		actorId: getCurrentUser().uid,
+		actorDisplayName: getCurrentUser()!.displayName,
+		actorId: getCurrentUser()!.uid,
 		actorType: 'users',
 		creationDateTime: (new Date()).toUTCString(),
 		message,
diff --git a/apps/comments/src/utils/cancelableRequest.ts b/apps/comments/src/utils/cancelableRequest.ts
index f3b52f1c781..8511469197d 100644
--- a/apps/comments/src/utils/cancelableRequest.ts
+++ b/apps/comments/src/utils/cancelableRequest.ts
@@ -6,20 +6,20 @@
 /**
  * Creates a cancelable axios 'request object'.
  *
- * @param {Function} request the axios promise request
- * @return {object}
+ * @param request the axios promise request
+ * @return
  */
-function cancelableRequest(request) {
+function cancelableRequest(request: (url: string, options?: Record<string, unknown>) => Promise<unknown>) {
 	const controller = new AbortController()
 	const signal = controller.signal
 
 	/**
 	 * Execute the request
 	 *
-	 * @param {string} url the url to send the request to
-	 * @param {object} [options] optional config for the request
+	 * @param url the url to send the request to
+	 * @param [options] optional config for the request
 	 */
-	const fetch = async function(url, options) {
+	const fetch = async function(url: string, options?: Record<string, unknown>) {
 		const response = await request(
 			url,
 			{ signal, ...options },
diff --git a/apps/comments/src/utils/decodeHtmlEntities.ts b/apps/comments/src/utils/decodeHtmlEntities.ts
index 4c492954256..ae12230724f 100644
--- a/apps/comments/src/utils/decodeHtmlEntities.ts
+++ b/apps/comments/src/utils/decodeHtmlEntities.ts
@@ -4,10 +4,10 @@
  */
 
 /**
- * @param {any} value -
- * @param {any} passes -
+ * @param value - the string to decode
+ * @param passes - the number of times to decode the string, default is 1
  */
-export function decodeHtmlEntities(value, passes = 1) {
+export function decodeHtmlEntities(value: string, passes = 1) {
 	const parser = new DOMParser()
 	let decoded = value
 	for (let i = 0; i < passes; i++) {
diff --git a/apps/comments/src/views/ActivityCommentAction.vue b/apps/comments/src/views/ActivityCommentAction.vue
index c2e21142008..376c8ae0888 100644
--- a/apps/comments/src/views/ActivityCommentAction.vue
+++ b/apps/comments/src/views/ActivityCommentAction.vue
@@ -6,11 +6,11 @@
 <template>
 	<Comment
 		v-bind="editorData"
-		:auto-complete="autoComplete"
-		:resource-type="resourceType"
+		:autoComplete="autoComplete"
+		:resourceType="resourceType"
 		:editor="true"
-		:user-data="userData"
-		:resource-id="resourceId"
+		:userData="userData"
+		:resourceId="resourceId"
 		class="comments-action"
 		@new="onNewComment" />
 </template>
diff --git a/apps/comments/src/views/ActivityCommentEntry.vue b/apps/comments/src/views/ActivityCommentEntry.vue
index 5749ab7cc0a..c75b1d7e6b2 100644
--- a/apps/comments/src/views/ActivityCommentEntry.vue
+++ b/apps/comments/src/views/ActivityCommentEntry.vue
@@ -8,11 +8,11 @@
 		ref="comment"
 		tag="li"
 		v-bind="comment.props"
-		:auto-complete="autoComplete"
-		:resource-type="resourceType"
+		:autoComplete="autoComplete"
+		:resourceType="resourceType"
 		:message="commentMessage"
-		:resource-id="resourceId"
-		:user-data="genMentionsData(comment.props.mentions)"
+		:resourceId="resourceId"
+		:userData="genMentionsData(comment.props.mentions)"
 		class="comments-activity"
 		@delete="reloadCallback()" />
 </template>
diff --git a/apps/comments/src/views/Comments.vue b/apps/comments/src/views/CommentsApp.vue
similarity index 94%
rename from apps/comments/src/views/Comments.vue
rename to apps/comments/src/views/CommentsApp.vue
index cdd9621ae19..bf359d4de09 100644
--- a/apps/comments/src/views/Comments.vue
+++ b/apps/comments/src/views/CommentsApp.vue
@@ -11,11 +11,11 @@
 		<!-- Editor -->
 		<Comment
 			v-bind="editorData"
-			:auto-complete="autoComplete"
-			:resource-type="resourceType"
-			:editor="true"
-			:user-data="userData"
-			:resource-id="currentResourceId"
+			editor
+			:autoComplete
+			:resourceType
+			:userData
+			:resourceId="currentResourceId"
 			class="comments__writer"
 			@new="onNewComment" />
 
@@ -36,10 +36,10 @@
 					v-model="comment.props.message"
 					tag="li"
 					v-bind="comment.props"
-					:auto-complete="autoComplete"
-					:resource-type="resourceType"
-					:resource-id="currentResourceId"
-					:user-data="genMentionsData(comment.props.mentions)"
+					:autoComplete
+					:resourceType
+					:resourceId="currentResourceId"
+					:userData="genMentionsData(comment.props.mentions)"
 					class="comments__list"
 					@delete="onDelete" />
 			</ul>
@@ -86,8 +86,7 @@ import { markCommentsAsRead } from '../services/ReadComments.ts'
 import cancelableRequest from '../utils/cancelableRequest.ts'
 
 export default {
-	/* eslint vue/multi-word-component-names: "warn" */
-	name: 'Comments',
+	name: 'CommentsApp',
 
 	components: {
 		Comment,
@@ -104,6 +103,8 @@ export default {
 
 	mixins: [CommentView],
 
+	expose: ['update'],
+
 	data() {
 		return {
 			error: '',
diff --git a/apps/comments/src/views/FilesSidebarTab.vue b/apps/comments/src/views/FilesSidebarTab.vue
index ce9be4bf28b..3bb9953ea53 100644
--- a/apps/comments/src/views/FilesSidebarTab.vue
+++ b/apps/comments/src/views/FilesSidebarTab.vue
@@ -7,7 +7,7 @@
 import type { IFolder, INode, IView } from '@nextcloud/files'
 
 import { computed } from 'vue'
-import Comments from './Comments.vue'
+import CommentsApp from './CommentsApp.vue'
 
 const props = defineProps<{
 	node?: INode
@@ -24,9 +24,9 @@ const resourceId = computed(() => props.node?.fileid)
 </script>
 
 <template>
-	<Comments
+	<CommentsApp
 		v-if="resourceId !== undefined"
 		:key="resourceId"
-		:resource-id="resourceId"
-		resource-type="files" />
+		:resourceId="resourceId"
+		resourceType="files" />
 </template>