diff --git a/docs/app.vue b/docs/app.vue
index d8b7c1bb..27fc36ab 100644
--- a/docs/app.vue
+++ b/docs/app.vue
@@ -12,7 +12,7 @@
     <Footer v-if="!$route.path.startsWith('/examples')" />
 
     <ClientOnly>
-      <LazyUDocsSearch ref="searchRef" :files="files" :navigation="navigation" :links="links" :fuse="{ resultLimit: 1000 }" />
+      <LazyUContentSearch ref="searchRef" :files="files" :navigation="navigation" :links="links" :fuse="{ resultLimit: 1000 }" />
     </ClientOnly>
 
     <UNotifications>
diff --git a/docs/components/Header.vue b/docs/components/Header.vue
index 8e1c94f0..c0ae0a6a 100644
--- a/docs/components/Header.vue
+++ b/docs/components/Header.vue
@@ -19,7 +19,7 @@
       <ColorPicker />
 
       <UTooltip text="Search" :shortcuts="[metaSymbol, 'K']">
-        <UDocsSearchButton :label="null" />
+        <UContentSearchButton :label="null" />
       </UTooltip>
 
       <UColorModeButton />
diff --git a/docs/content/index.yml b/docs/content/index.yml
index 450174c4..ad16dd9d 100644
--- a/docs/content/index.yml
+++ b/docs/content/index.yml
@@ -178,7 +178,7 @@ pro:
             </UPageBody>
 
             <template #right>
-              <UDocsToc :links="page.body.toc.links" />
+              <UContentToc :links="page.body.toc.links" />
             </template>
           </UPage>
         </template>
diff --git a/docs/error.vue b/docs/error.vue
index 09486949..7a1f6180 100644
--- a/docs/error.vue
+++ b/docs/error.vue
@@ -16,7 +16,7 @@
     <Footer />
 
     <ClientOnly>
-      <LazyUDocsSearch :files="files" :navigation="navigation" :links="links" :fuse="{ resultLimit: 1000 }" />
+      <LazyUContentSearch :files="files" :navigation="navigation" :links="links" :fuse="{ resultLimit: 1000 }" />
     </ClientOnly>
 
     <UNotifications>
diff --git a/docs/pages/[...slug].vue b/docs/pages/[...slug].vue
index bb76e6ac..8635e28b 100644
--- a/docs/pages/[...slug].vue
+++ b/docs/pages/[...slug].vue
@@ -7,11 +7,11 @@
 
       <hr v-if="surround?.length">
 
-      <UDocsSurround :surround="surround" />
+      <UContentSurround :surround="surround" />
     </UPageBody>
 
     <template v-if="page?.body?.toc?.links?.length" #right>
-      <UDocsToc :links="page.body.toc.links">
+      <UContentToc :links="page.body.toc.links">
         <template #bottom>
           <div class="hidden lg:block space-y-6 !mt-6">
             <UDivider v-if="page.body?.toc?.links?.length" type="dashed" />
@@ -30,7 +30,7 @@
             </div>
           </div>
         </template>
-      </UDocsToc>
+      </UContentToc>
     </template>
   </UPage>
 </template>
diff --git a/docs/pages/index.vue b/docs/pages/index.vue
index 18f9e4c4..25a7e2d2 100644
--- a/docs/pages/index.vue
+++ b/docs/pages/index.vue
@@ -254,7 +254,7 @@
             </template>
 
             <template #aside-top>
-              <UDocsSearchButton size="md" class="w-full" />
+              <UContentSearchButton size="md" class="w-full" />
             </template>
 
             <template #aside-default>
@@ -283,7 +283,7 @@
             </template>
 
             <template #docs-surround>
-              <UDocsSurround
+              <UContentSurround
                 :surround="(surround as unknown as ParsedContent[])"
                 class="w-full gap-4"
                 :ui="{
@@ -302,7 +302,7 @@
 
             <template #docs-toc>
               <div class="absolute top-0 left-0 right-0 space-y-3">
-                <UDocsToc :links="toc" class="bg-transparent relative max-h-full overflow-hidden top-0" :ui="({ container: { base: '!pt-0 !pb-4' } } as any)" />
+                <UContentToc :links="toc" class="bg-transparent relative max-h-full overflow-hidden top-0" :ui="({ container: { base: '!pt-0 !pb-4' } } as any)" />
 
                 <UDivider type="dashed" :ui="{ border: { base: 'border-gray-800/10 dark:border-gray-200/10' } }" />
 
@@ -620,8 +620,8 @@ const docsBlocks = computed(() => [isAfterStep(steps.docs) && {
         slot: 'docs-surround',
         class: 'bottom-4 inset-x-4 h-28'
       } : {
-        name: 'UDocsSurround',
-        to: '/pro/components/docs-surround',
+        name: 'UContentSurround',
+        to: '/pro/components/content-surround',
         class: 'bottom-4 inset-x-4 h-28',
         inactive: false
       }]
@@ -629,8 +629,8 @@ const docsBlocks = computed(() => [isAfterStep(steps.docs) && {
       name: '#default',
       class: 'left-4 right-72 inset-y-4'
     }]), isAfterStep(steps.docs + 13) ? {
-      name: 'UDocsToc',
-      to: '/pro/components/docs-toc',
+      name: 'UContentToc',
+      to: '/pro/components/content-toc',
       class: 'right-4 inset-y-4 w-64',
       inactive: isAfterStep(steps.docs + 14),
       children: [{