diff --git a/handlers/buttons.js b/handlers/buttons.js
index 6bb4939..77ea5c8 100644
--- a/handlers/buttons.js
+++ b/handlers/buttons.js
@@ -304,7 +304,7 @@ async function handleClaim(interaction, ticket) {
     const renameInfo = await canRename(freshTicket);
     if (renameInfo.ok) {
       const newName = makeTicketName(
-        { escalated: !!freshTicket.escalated, claimed: true },
+        { escalated: !!freshTicket.escalated, claimed: true, claimedBy: claimerLabel },
         freshTicket,
         guild
       );
@@ -328,7 +328,7 @@ async function handleClaim(interaction, ticket) {
         interaction.guild,
         freshTicket,
         interaction.user.id,
-        interaction.channel.name
+        claimerLabel
       );
       if (staffChan) {
         await Ticket.updateOne(
diff --git a/services/tickets.js b/services/tickets.js
index f7a6d20..95703be 100644
--- a/services/tickets.js
+++ b/services/tickets.js
@@ -33,7 +33,7 @@ function getSenderLocal(senderEmail) {
   return (senderEmail || 'unknown').split('@')[0].toLowerCase();
 }
 
-function makeTicketName({ escalated, claimed }, ticket, guild) {
+function makeTicketName({ escalated, claimed, claimedBy }, ticket, guild) {
   const senderLocal = getSenderLocal(ticket.senderEmail);
   const num = ticket.ticketNumber || 1;
   if (escalated) {
@@ -41,7 +41,10 @@ function makeTicketName({ escalated, claimed }, ticket, guild) {
       ? `e-ticket-${senderLocal}-${num}`
       : `escalated-ticket-${senderLocal}-${num}`;
   }
-  return `ticket-${senderLocal}-${num}`;
+  if (claimed) {
+    return `${senderLocal}-${num}`;
+  }
+  return `ticket-${num}`;
 }
 
 async function canRename(ticket) {