diff --git a/src/constants/kinds.ts b/src/constants/kinds.ts
index 91cd94d..1b38ebb 100644
--- a/src/constants/kinds.ts
+++ b/src/constants/kinds.ts
@@ -92,7 +92,7 @@ export const EVENT_KINDS: Record<number | string, EventKind> = {
   },
   3: {
     kind: 3,
-    name: "Contacts",
+    name: "Contact List",
     description: "Follows",
     nip: "02",
     icon: Users,
@@ -454,7 +454,7 @@ export const EVENT_KINDS: Record<number | string, EventKind> = {
   // Git stuff
   1617: {
     kind: 1617,
-    name: "Patches",
+    name: "Patch",
     description: "Git Patches",
     nip: "34",
     icon: GitBranch,
@@ -482,7 +482,7 @@ export const EVENT_KINDS: Record<number | string, EventKind> = {
   },
   1622: {
     kind: 1622,
-    name: "Git Replies",
+    name: "Git Reply",
     description: "Git Replies (deprecated)",
     nip: "34",
     icon: MessageCircle,
@@ -706,49 +706,49 @@ export const EVENT_KINDS: Record<number | string, EventKind> = {
   },
   10003: {
     kind: 10003,
-    name: "Bookmarks",
+    name: "Bookmark List",
     description: "Bookmark list",
     nip: "51",
     icon: Bookmark,
   },
   10004: {
     kind: 10004,
-    name: "Communities",
+    name: "Community List",
     description: "Communities list",
     nip: "51",
     icon: Users,
   },
   10005: {
     kind: 10005,
-    name: "Public Chats",
+    name: "Public Chat List",
     description: "Public chats list",
     nip: "51",
     icon: MessageCircle,
   },
   10006: {
     kind: 10006,
-    name: "Blocked Relays",
+    name: "Blocked Relay List",
     description: "Blocked relays list",
     nip: "51",
     icon: Radio,
   },
   10007: {
     kind: 10007,
-    name: "Search Relays",
+    name: "Search Relay List",
     description: "Search relays list",
     nip: "51",
     icon: Radio,
   },
   10009: {
     kind: 10009,
-    name: "User Groups",
+    name: "User Group List",
     description: "User groups",
     nip: "51",
     icon: Users,
   },
   10012: {
     kind: 10012,
-    name: "Favorite Relays",
+    name: "Favorite Relay List",
     description: "Favorite relays list",
     nip: "51",
     icon: Star,
@@ -762,7 +762,7 @@ export const EVENT_KINDS: Record<number | string, EventKind> = {
   },
   10015: {
     kind: 10015,
-    name: "Interests",
+    name: "Interest List",
     description: "Interests list",
     nip: "51",
     icon: Heart,
@@ -776,7 +776,7 @@ export const EVENT_KINDS: Record<number | string, EventKind> = {
   },
   10020: {
     kind: 10020,
-    name: "Media Follows",
+    name: "Media Follow List",
     description: "Media follows",
     nip: "51",
     icon: Play,
@@ -1006,56 +1006,56 @@ export const EVENT_KINDS: Record<number | string, EventKind> = {
   // Replaceable events (kind 30000+)
   30000: {
     kind: 30000,
-    name: "Follow Sets",
+    name: "Follow Set",
     description: "Follow sets",
     nip: "51",
     icon: Users,
   },
   30001: {
     kind: 30001,
-    name: "Generic Lists",
+    name: "Generic List",
     description: "Generic lists (deprecated)",
     nip: "51",
     icon: List,
   },
   30002: {
     kind: 30002,
-    name: "Relay Sets",
+    name: "Relay Set",
     description: "Relay sets",
     nip: "51",
     icon: Radio,
   },
   30003: {
     kind: 30003,
-    name: "Bookmark Sets",
+    name: "Bookmark Set",
     description: "Bookmark sets",
     nip: "51",
     icon: Bookmark,
   },
   30004: {
     kind: 30004,
-    name: "Curation Sets",
+    name: "Curation Set",
     description: "Curation sets",
     nip: "51",
     icon: ListFilter,
   },
   30005: {
     kind: 30005,
-    name: "Video Sets",
+    name: "Video Set",
     description: "Video sets",
     nip: "51",
     icon: Video,
   },
   30007: {
     kind: 30007,
-    name: "Kind Mute Sets",
+    name: "Kind Mute Set",
     description: "Kind mute sets",
     nip: "51",
     icon: Filter,
   },
   30008: {
     kind: 30008,
-    name: "Profile Badges",
+    name: "Profile Badge",
     description: "Profile Badges",
     nip: "58",
     icon: Award,
@@ -1069,7 +1069,7 @@ export const EVENT_KINDS: Record<number | string, EventKind> = {
   },
   30015: {
     kind: 30015,
-    name: "Interest Sets",
+    name: "Interest Set",
     description: "Interest sets",
     nip: "51",
     icon: Heart,
@@ -1118,7 +1118,7 @@ export const EVENT_KINDS: Record<number | string, EventKind> = {
   },
   30030: {
     kind: 30030,
-    name: "Emoji Sets",
+    name: "Emoji Set",
     description: "Emoji sets",
     nip: "51",
     icon: Smile,
@@ -1139,7 +1139,7 @@ export const EVENT_KINDS: Record<number | string, EventKind> = {
   // },
   30063: {
     kind: 30063,
-    name: "Release Artifacts",
+    name: "Release Artifact Set",
     description: "Release artifact sets",
     nip: "51",
     icon: Package,
@@ -1188,7 +1188,7 @@ export const EVENT_KINDS: Record<number | string, EventKind> = {
   },
   30315: {
     kind: 30315,
-    name: "Status",
+    name: "User Status",
     description: "User Statuses",
     nip: "38",
     icon: MessageSquare,
@@ -1349,21 +1349,21 @@ export const EVENT_KINDS: Record<number | string, EventKind> = {
   },
   39089: {
     kind: 39089,
-    name: "Starter Packs",
+    name: "Starter Pack",
     description: "Starter packs",
     nip: "51",
     icon: PackageOpen,
   },
   39092: {
     kind: 39092,
-    name: "Media Starter Packs",
+    name: "Media Starter Pack",
     description: "Media starter packs",
     nip: "51",
     icon: Play,
   },
   39701: {
     kind: 39701,
-    name: "Web Bookmarks",
+    name: "Web Bookmark",
     description: "Web bookmarks",
     nip: "B0",
     icon: Bookmark,