diff --git a/src/app/components/CalendarEventItem.svelte b/src/app/components/CalendarEventItem.svelte
index 0e924646..19ed9e1e 100644
--- a/src/app/components/CalendarEventItem.svelte
+++ b/src/app/components/CalendarEventItem.svelte
@@ -12,11 +12,9 @@
   const {
     url,
     event,
-    hideActions = false,
   }: {
     url: string
     event: TrustedEvent
-    hideActions?: boolean
   } = $props()
 
   const meta = $derived(fromPairs(event.tags) as Record<string, string>)
@@ -40,8 +38,6 @@
   <Content {event} expandMode="inline" quoteProps={{relays: [url]}} />
   <div class="flex w-full flex-col items-end justify-between gap-2 sm:flex-row">
     <EventPostedBy {event} />
-    {#if !hideActions}
-      <CalendarEventActions showActivity {url} {event} />
-    {/if}
+    <CalendarEventActions showActivity {url} {event} />
   </div>
 </Link>
diff --git a/src/app/components/ThreadReply.svelte b/src/app/components/EventReply.svelte
similarity index 100%
rename from src/app/components/ThreadReply.svelte
rename to src/app/components/EventReply.svelte
diff --git a/src/app/components/ThreadItem.svelte b/src/app/components/ThreadItem.svelte
index f40fe7f2..96cab198 100644
--- a/src/app/components/ThreadItem.svelte
+++ b/src/app/components/ThreadItem.svelte
@@ -11,11 +11,9 @@
   const {
     url,
     event,
-    hideActions = false,
   }: {
     url: string
     event: TrustedEvent
-    hideActions?: boolean
   } = $props()
 
   const title = event.tags.find(nthEq(0, "title"))?.[1]
@@ -37,8 +35,6 @@
   <Content {event} expandMode="inline" quoteProps={{relays: [url]}} />
   <div class="flex w-full flex-col items-end justify-between gap-2 sm:flex-row">
     <EventPostedBy {event} />
-    {#if !hideActions}
-      <ThreadActions showActivity {url} {event} />
-    {/if}
+    <ThreadActions showActivity {url} {event} />
   </div>
 </Link>
diff --git a/src/routes/spaces/[relay]/calendar/[id]/+page.svelte b/src/routes/spaces/[relay]/calendar/[id]/+page.svelte
index 180d9267..05e94548 100644
--- a/src/routes/spaces/[relay]/calendar/[id]/+page.svelte
+++ b/src/routes/spaces/[relay]/calendar/[id]/+page.svelte
@@ -12,8 +12,8 @@
   import Content from "@app/components/Content.svelte"
   import NoteCard from "@app/components/NoteCard.svelte"
   import MenuSpaceButton from "@app/components/MenuSpaceButton.svelte"
-  import ThreadActions from "@app/components/ThreadActions.svelte"
-  import ThreadReply from "@app/components/ThreadReply.svelte"
+  import CalendarEventActions from "@app/components/CalendarEventActions.svelte"
+  import EventReply from "@app/components/EventReply.svelte"
   import {deriveEvent, decodeRelay} from "@app/state"
   import {setChecked} from "@app/notifications"
 
@@ -57,7 +57,7 @@
       <div class="flex justify-end px-2 pb-2">
         <Button class="btn btn-primary" onclick={openReply}>
           <Icon icon="reply" />
-          Reply to thread
+          Leave comment
         </Button>
       </div>
     {/if}
@@ -65,7 +65,7 @@
       <NoteCard event={reply} class="card2 bg-alt z-feature w-full">
         <div class="col-3 ml-12">
           <Content showEntire event={reply} />
-          <ThreadActions event={reply} {url} />
+          <CalendarEventActions event={reply} {url} />
         </div>
       </NoteCard>
     {/each}
@@ -80,14 +80,14 @@
     <NoteCard event={$event} class="card2 bg-alt z-feature w-full">
       <div class="col-3 ml-12">
         <Content showEntire event={$event} quoteProps={{relays: [url]}} />
-        <ThreadActions event={$event} {url} />
+        <CalendarEventActions event={$event} {url} />
       </div>
     </NoteCard>
   {:else}
     {#await sleep(5000)}
-      <Spinner loading>Loading thread...</Spinner>
+      <Spinner loading>Loading comments...</Spinner>
     {:then}
-      <p>Failed to load thread.</p>
+      <p>Failed to load comments.</p>
     {/await}
   {/if}
   <PageBar class="mx-0">
@@ -110,5 +110,5 @@
   </PageBar>
 </div>
 {#if showReply}
-  <ThreadReply {url} event={$event} onClose={closeReply} onSubmit={closeReply} />
+  <EventReply {url} event={$event} onClose={closeReply} onSubmit={closeReply} />
 {/if}
diff --git a/src/routes/spaces/[relay]/threads/[id]/+page.svelte b/src/routes/spaces/[relay]/threads/[id]/+page.svelte
index 180d9267..c65cb6bd 100644
--- a/src/routes/spaces/[relay]/threads/[id]/+page.svelte
+++ b/src/routes/spaces/[relay]/threads/[id]/+page.svelte
@@ -13,7 +13,7 @@
   import NoteCard from "@app/components/NoteCard.svelte"
   import MenuSpaceButton from "@app/components/MenuSpaceButton.svelte"
   import ThreadActions from "@app/components/ThreadActions.svelte"
-  import ThreadReply from "@app/components/ThreadReply.svelte"
+  import EventReply from "@app/components/EventReply.svelte"
   import {deriveEvent, decodeRelay} from "@app/state"
   import {setChecked} from "@app/notifications"
 
@@ -110,5 +110,5 @@
   </PageBar>
 </div>
 {#if showReply}
-  <ThreadReply {url} event={$event} onClose={closeReply} onSubmit={closeReply} />
+  <EventReply {url} event={$event} onClose={closeReply} onSubmit={closeReply} />
 {/if}