diff --git a/docs/content/drafts/Tooltip.mdx b/docs/content/drafts/Tooltip.mdx
index 237c49470da..3f116ace638 100644
--- a/docs/content/drafts/Tooltip.mdx
+++ b/docs/content/drafts/Tooltip.mdx
@@ -1,7 +1,8 @@
 ---
-componentId: tooltip
-title: Tooltip
-status: Alpha
+componentId: tooltip_v2
+title: Tooltip v2
+status: Draft
+source: https://github.com/primer/react/blob/main/src/drafts/Tooltip.tsx
 ---
 
 import data from '../../../src/drafts/Tooltip/Tooltip.docs.json'
diff --git a/docs/src/@primer/gatsby-theme-doctocat/nav.yml b/docs/src/@primer/gatsby-theme-doctocat/nav.yml
index 34a4ed99699..aefaa6ef108 100644
--- a/docs/src/@primer/gatsby-theme-doctocat/nav.yml
+++ b/docs/src/@primer/gatsby-theme-doctocat/nav.yml
@@ -160,6 +160,8 @@
   children:
     - title: Dialog v2
       url: /drafts/Dialog
+    - title: Hidden
+      url: /drafts/Hidden
     - title: InlineAutocomplete
       url: /drafts/InlineAutocomplete
     - title: MarkdownEditor
@@ -170,8 +172,8 @@
       url: /drafts/UnderlineNav2
     - title: PageHeader
       url: /drafts/PageHeader
-    - title: Hidden
-      url: /drafts/Hidden
+    - title: Tooltip v2
+      url: /drafts/Tooltip
 - title: Deprecated
   children:
     - title: ActionList (legacy)
diff --git a/src/drafts/Tooltip/Tooltip.docs.json b/src/drafts/Tooltip/Tooltip.docs.json
index cfed6a9ae3f..d49cf420c97 100644
--- a/src/drafts/Tooltip/Tooltip.docs.json
+++ b/src/drafts/Tooltip/Tooltip.docs.json
@@ -1,5 +1,5 @@
 {
-  "id": "tooltip",
+  "id": "tooltip_v2",
   "name": "Tooltip",
   "status": "draft",
   "a11yReviewed": false,