diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dc8042b..52f2796c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 ### Features
 
-* switch to ResourceRenderer ([#21](https://github.com/idosal/mcp-ui/issues/21)) ([6fe3166](https://github.com/idosal/mcp-ui/commit/6fe316682675e27db914d60696754677e3783448))
+* switch to UiResourceRenderer ([#21](https://github.com/idosal/mcp-ui/issues/21)) ([6fe3166](https://github.com/idosal/mcp-ui/commit/6fe316682675e27db914d60696754677e3783448))
 
 
 ### BREAKING CHANGES
@@ -16,7 +16,7 @@
 ### Bug Fixes
 
 * export RemoteDomResource ([2b86f2d](https://github.com/idosal/mcp-ui/commit/2b86f2dd4506de49c69908e23d84a2a323170446))
-* export ResourceRenderer and HtmlResource ([2b841a5](https://github.com/idosal/mcp-ui/commit/2b841a556c1111ed70ccb3d3987afd21fe7df897))
+* export UiResourceRenderer and HtmlResource ([2b841a5](https://github.com/idosal/mcp-ui/commit/2b841a556c1111ed70ccb3d3987afd21fe7df897))
 
 # [2.5.0](https://github.com/idosal/mcp-ui/compare/v2.4.0...v2.5.0) (2025-06-27)
 
diff --git a/README.md b/README.md
index 6a8fd01f..9f90042b 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,8 @@
 
 `mcp-ui` is a TypeScript SDK comprising two packages:
 
-* **`@mcp-ui/server`**: Utilities to generate UI snippets (`HtmlResourceBlock`) on your MCP server.
-* **`@mcp-ui/client`**: UI components (e.g., `<ResourceRenderer />`) to render those snippets and handle their events.
+* **`@mcp-ui/server`**: Utilities to generate UI resources (`UIResource`) on your MCP server.
+* **`@mcp-ui/client`**: UI components (e.g., `<UIResourceRenderer />`) to render the UI resources and handle their events.
 
 Together, they let you define reusable UI snippets on the server side, seamlessly and securely render them in the client, and react to their actions in the MCP host environment.
 
@@ -44,11 +44,11 @@ Together, they let you define reusable UI snippets on the server side, seamlessl
 
 In essence, by using `mcp-ui` SDKs, servers and hosts can agree on contracts that enable them to create and render interactive UI snippets (as a path to a standardized UI approach in MCP).
 
-### HTML Resource Block
-The primary payload returned from the server to the client is the `HtmlResourceBlock`:
+### UI Resource
+The primary payload returned from the server to the client is the `UIResource`:
 
 ```ts
-interface HtmlResourceBlock {
+interface UIResource {
   type: 'resource';
   resource: {
     uri: string;       // ui://component/id
@@ -67,11 +67,11 @@ interface HtmlResourceBlock {
 
 ### Resource Renderer
 
-The HTML Resource Block is rendered in the `<ResourceRenderer />` component. It automatically detects the resource type and renders the appropriate component.
+The UI Resource is rendered in the `<UIResourceRenderer />` component. It automatically detects the resource type and renders the appropriate component.
 
 It accepts the following props:
 - **`resource`**: The resource object from an MCP response. Should include `uri`, `mimeType`, and content (`text`, `blob`, or `content`)
-- **`onUiAction`**: Optional callback for handling UI actions from the resource:
+- **`onUIAction`**: Optional callback for handling UI actions from the resource:
   ```typescript
   { type: 'tool', payload: { toolName: string, params: Record<string, unknown> } } |
   { type: 'intent', payload: { intent: string, params: Record<string, unknown> } } |
@@ -89,7 +89,7 @@ It accepts the following props:
 
 #### HTML (`text/html` and `text/uri-list`)
 
-Rendered using the `<HtmlResource />` component, which displays content inside an `<iframe>`. This is suitable for self-contained HTML or embedding external apps.
+Rendered using the `<HTMLResourceRenderer />` component, which displays content inside an `<iframe>`. This is suitable for self-contained HTML or embedding external apps.
 
 *   **`mimeType`**:
     *   `text/html`: Renders inline HTML content.
@@ -97,7 +97,7 @@ Rendered using the `<HtmlResource />` component, which displays content inside a
 
 #### Remote DOM (`application/vnd.mcp-ui.remote-dom`)
 
-Rendered using the `<RemoteDomResource />` component, which uses Shopify's [`remote-dom`](https://github.com/Shopify/remote-dom). The server responds with a script that describes the UI and events. On the host, the script is securely rendered in a sandboxed iframe, and the UI changes are communicated to the host in JSON, where they're rendered using the host's component library. This is more flexible than iframes and allows for UIs that match the host's look-and-feel.
+Rendered using the `<RemoteDOMResourceRenderer />` component, which uses Shopify's [`remote-dom`](https://github.com/Shopify/remote-dom). The server responds with a script that describes the UI and events. On the host, the script is securely rendered in a sandboxed iframe, and the UI changes are communicated to the host in JSON, where they're rendered using the host's component library. This is more flexible than iframes and allows for UIs that match the host's look-and-feel.
 
 * **`mimeType`**: `application/vnd.mcp-ui.remote-dom; flavor={react | webcomponents}`
 
@@ -123,7 +123,7 @@ yarn add @mcp-ui/server @mcp-ui/client
 1. **Server-side**: Build your resource blocks
 
    ```ts
-   import { createHtmlResource } from '@mcp-ui/server';
+   import { createUIResource } from '@mcp-ui/server';
    import {
     createRemoteComponent,
     createRemoteDocument,
@@ -131,14 +131,14 @@ yarn add @mcp-ui/server @mcp-ui/client
    } from '@remote-dom/core';
 
    // Inline HTML
-   const htmlResource = createHtmlResource({
+   const htmlResource = createUIResource({
      uri: 'ui://greeting/1',
      content: { type: 'rawHtml', htmlString: '<p>Hello, MCP UI!</p>' },
      delivery: 'text',
    });
 
    // External URL
-   const externalUrlResource = createHtmlResource({
+   const externalUrlResource = createUIResource({
      uri: 'ui://greeting/1',
      content: { type: 'externalUrl', iframeUrl: 'https://example.com' },
      delivery: 'text',
@@ -149,7 +149,7 @@ yarn add @mcp-ui/server @mcp-ui/client
 
    ```tsx
    import React from 'react';
-   import { ResourceRenderer } from '@mcp-ui/client';
+   import { UIResourceRenderer } from '@mcp-ui/client';
 
    function App({ mcpResource }) {
      if (
@@ -157,9 +157,9 @@ yarn add @mcp-ui/server @mcp-ui/client
        mcpResource.resource.uri?.startsWith('ui://')
      ) {
        return (
-         <ResourceRenderer
+         <UIResourceRenderer
            resource={mcpResource.resource}
-           onUiAction={(result) => {
+           onUIAction={(result) => {
              console.log('Action:', result);
              return { status: 'ok' };
            }}
@@ -170,7 +170,7 @@ yarn add @mcp-ui/server @mcp-ui/client
    }
    ```
 
-3. **Enjoy** interactive MCP UI snippets — no extra configuration required.
+3. **Enjoy** interactive MCP UI — no extra configuration required.
 
 ## 🌍 Examples
 
@@ -199,6 +199,7 @@ Host and user security is one of `mcp-ui`'s primary concerns. In all content typ
 - [X] Support Web Components
 - [X] Support Remote-DOM
 - [ ] Add component libraries (in progress)
+- [ ] Support additional frontend frameworks
 - [ ] Add declarative UI content type
 - [ ] Support generative UI?
       
diff --git a/docs/src/.vitepress/cache/deps/@theme_index.js b/docs/src/.vitepress/cache/deps/@theme_index.js
deleted file mode 100644
index 86c1dc2d..00000000
--- a/docs/src/.vitepress/cache/deps/@theme_index.js
+++ /dev/null
@@ -1,283 +0,0 @@
-import { useMediaQuery } from './chunk-2DFNRHEN.js';
-import { computed, ref, shallowRef, watch } from './chunk-IUSDUMZG.js';
-
-// node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/index.js
-import '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/styles/fonts.css';
-
-// node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/without-fonts.js
-import '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/styles/vars.css';
-import '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/styles/base.css';
-import '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/styles/icons.css';
-import '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/styles/utils.css';
-import '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/styles/components/custom-block.css';
-import '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/styles/components/vp-code.css';
-import '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/styles/components/vp-code-group.css';
-import '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/styles/components/vp-doc.css';
-import '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/styles/components/vp-sponsor.css';
-import VPBadge from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPBadge.vue';
-import Layout from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/Layout.vue';
-import { default as default2 } from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPBadge.vue';
-import { default as default3 } from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPButton.vue';
-import { default as default4 } from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPDocAsideSponsors.vue';
-import { default as default5 } from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPFeatures.vue';
-import { default as default6 } from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPHomeContent.vue';
-import { default as default7 } from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPHomeFeatures.vue';
-import { default as default8 } from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPHomeHero.vue';
-import { default as default9 } from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPHomeSponsors.vue';
-import { default as default10 } from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPImage.vue';
-import { default as default11 } from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPLink.vue';
-import { default as default12 } from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPNavBarSearch.vue';
-import { default as default13 } from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPSocialLink.vue';
-import { default as default14 } from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPSocialLinks.vue';
-import { default as default15 } from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPSponsors.vue';
-import { default as default16 } from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPTeamMembers.vue';
-import { default as default17 } from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPTeamPage.vue';
-import { default as default18 } from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPTeamPageSection.vue';
-import { default as default19 } from '/Users/idosal/mcp-ui/node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/components/VPTeamPageTitle.vue';
-
-// node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/composables/local-nav.js
-import { onContentUpdated } from 'vitepress';
-
-// node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/composables/outline.js
-import { getScrollOffset } from 'vitepress';
-
-// node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/support/utils.js
-import { withBase } from 'vitepress';
-
-// node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/composables/data.js
-import { useData as useData$ } from 'vitepress';
-var useData = useData$;
-
-// node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/support/utils.js
-function ensureStartingSlash(path) {
-  return path.startsWith('/') ? path : `/${path}`;
-}
-
-// node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/support/sidebar.js
-function getSidebar(_sidebar, path) {
-  if (Array.isArray(_sidebar)) return addBase(_sidebar);
-  if (_sidebar == null) return [];
-  path = ensureStartingSlash(path);
-  const dir = Object.keys(_sidebar)
-    .sort((a, b) => {
-      return b.split('/').length - a.split('/').length;
-    })
-    .find((dir2) => {
-      return path.startsWith(ensureStartingSlash(dir2));
-    });
-  const sidebar = dir ? _sidebar[dir] : [];
-  return Array.isArray(sidebar)
-    ? addBase(sidebar)
-    : addBase(sidebar.items, sidebar.base);
-}
-function getSidebarGroups(sidebar) {
-  const groups = [];
-  let lastGroupIndex = 0;
-  for (const index in sidebar) {
-    const item = sidebar[index];
-    if (item.items) {
-      lastGroupIndex = groups.push(item);
-      continue;
-    }
-    if (!groups[lastGroupIndex]) {
-      groups.push({ items: [] });
-    }
-    groups[lastGroupIndex].items.push(item);
-  }
-  return groups;
-}
-function addBase(items, _base) {
-  return [...items].map((_item) => {
-    const item = { ..._item };
-    const base = item.base || _base;
-    if (base && item.link) item.link = base + item.link;
-    if (item.items) item.items = addBase(item.items, base);
-    return item;
-  });
-}
-
-// node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/composables/sidebar.js
-function useSidebar() {
-  const { frontmatter, page, theme: theme2 } = useData();
-  const is960 = useMediaQuery('(min-width: 960px)');
-  const isOpen = ref(false);
-  const _sidebar = computed(() => {
-    const sidebarConfig = theme2.value.sidebar;
-    const relativePath = page.value.relativePath;
-    return sidebarConfig ? getSidebar(sidebarConfig, relativePath) : [];
-  });
-  const sidebar = ref(_sidebar.value);
-  watch(_sidebar, (next, prev) => {
-    if (JSON.stringify(next) !== JSON.stringify(prev))
-      sidebar.value = _sidebar.value;
-  });
-  const hasSidebar = computed(() => {
-    return (
-      frontmatter.value.sidebar !== false &&
-      sidebar.value.length > 0 &&
-      frontmatter.value.layout !== 'home'
-    );
-  });
-  const leftAside = computed(() => {
-    if (hasAside)
-      return frontmatter.value.aside == null
-        ? theme2.value.aside === 'left'
-        : frontmatter.value.aside === 'left';
-    return false;
-  });
-  const hasAside = computed(() => {
-    if (frontmatter.value.layout === 'home') return false;
-    if (frontmatter.value.aside != null) return !!frontmatter.value.aside;
-    return theme2.value.aside !== false;
-  });
-  const isSidebarEnabled = computed(() => hasSidebar.value && is960.value);
-  const sidebarGroups = computed(() => {
-    return hasSidebar.value ? getSidebarGroups(sidebar.value) : [];
-  });
-  function open() {
-    isOpen.value = true;
-  }
-  function close() {
-    isOpen.value = false;
-  }
-  function toggle() {
-    isOpen.value ? close() : open();
-  }
-  return {
-    isOpen,
-    sidebar,
-    sidebarGroups,
-    hasSidebar,
-    hasAside,
-    leftAside,
-    isSidebarEnabled,
-    open,
-    close,
-    toggle,
-  };
-}
-
-// node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/composables/outline.js
-var ignoreRE = /\b(?:VPBadge|header-anchor|footnote-ref|ignore-header)\b/;
-var resolvedHeaders = [];
-function getHeaders(range) {
-  const headers = [
-    ...document.querySelectorAll('.VPDoc :where(h1,h2,h3,h4,h5,h6)'),
-  ]
-    .filter((el) => el.id && el.hasChildNodes())
-    .map((el) => {
-      const level = Number(el.tagName[1]);
-      return {
-        element: el,
-        title: serializeHeader(el),
-        link: '#' + el.id,
-        level,
-      };
-    });
-  return resolveHeaders(headers, range);
-}
-function serializeHeader(h) {
-  let ret = '';
-  for (const node of h.childNodes) {
-    if (node.nodeType === 1) {
-      if (ignoreRE.test(node.className)) continue;
-      ret += node.textContent;
-    } else if (node.nodeType === 3) {
-      ret += node.textContent;
-    }
-  }
-  return ret.trim();
-}
-function resolveHeaders(headers, range) {
-  if (range === false) {
-    return [];
-  }
-  const levelsRange =
-    (typeof range === 'object' && !Array.isArray(range)
-      ? range.level
-      : range) || 2;
-  const [high, low] =
-    typeof levelsRange === 'number'
-      ? [levelsRange, levelsRange]
-      : levelsRange === 'deep'
-        ? [2, 6]
-        : levelsRange;
-  return buildTree(headers, high, low);
-}
-function buildTree(data, min, max) {
-  resolvedHeaders.length = 0;
-  const result = [];
-  const stack = [];
-  data.forEach((item) => {
-    const node = { ...item, children: [] };
-    let parent = stack[stack.length - 1];
-    while (parent && parent.level >= node.level) {
-      stack.pop();
-      parent = stack[stack.length - 1];
-    }
-    if (
-      node.element.classList.contains('ignore-header') ||
-      (parent && 'shouldIgnore' in parent)
-    ) {
-      stack.push({ level: node.level, shouldIgnore: true });
-      return;
-    }
-    if (node.level > max || node.level < min) return;
-    resolvedHeaders.push({ element: node.element, link: node.link });
-    if (parent) parent.children.push(node);
-    else result.push(node);
-    stack.push(node);
-  });
-  return result;
-}
-
-// node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/composables/local-nav.js
-function useLocalNav() {
-  const { theme: theme2, frontmatter } = useData();
-  const headers = shallowRef([]);
-  const hasLocalNav = computed(() => {
-    return headers.value.length > 0;
-  });
-  onContentUpdated(() => {
-    headers.value = getHeaders(
-      frontmatter.value.outline ?? theme2.value.outline,
-    );
-  });
-  return {
-    headers,
-    hasLocalNav,
-  };
-}
-
-// node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/without-fonts.js
-var theme = {
-  Layout,
-  enhanceApp: ({ app }) => {
-    app.component('Badge', VPBadge);
-  },
-};
-var without_fonts_default = theme;
-export {
-  default2 as VPBadge,
-  default3 as VPButton,
-  default4 as VPDocAsideSponsors,
-  default5 as VPFeatures,
-  default6 as VPHomeContent,
-  default7 as VPHomeFeatures,
-  default8 as VPHomeHero,
-  default9 as VPHomeSponsors,
-  default10 as VPImage,
-  default11 as VPLink,
-  default12 as VPNavBarSearch,
-  default13 as VPSocialLink,
-  default14 as VPSocialLinks,
-  default15 as VPSponsors,
-  default16 as VPTeamMembers,
-  default17 as VPTeamPage,
-  default18 as VPTeamPageSection,
-  default19 as VPTeamPageTitle,
-  without_fonts_default as default,
-  useLocalNav,
-  useSidebar,
-};
-//# sourceMappingURL=@theme_index.js.map
diff --git a/docs/src/.vitepress/cache/deps/@theme_index.js.map b/docs/src/.vitepress/cache/deps/@theme_index.js.map
deleted file mode 100644
index 415792e2..00000000
--- a/docs/src/.vitepress/cache/deps/@theme_index.js.map
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../../node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/index.js", "../../../../../node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/without-fonts.js", "../../../../../node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/composables/local-nav.js", "../../../../../node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/composables/outline.js", "../../../../../node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/support/utils.js", "../../../../../node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/composables/data.js", "../../../../../node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/support/sidebar.js", "../../../../../node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/composables/sidebar.js"],
-  "sourcesContent": ["import './styles/fonts.css';\nexport * from './without-fonts';\nexport { default as default } from './without-fonts';\n", "import './styles/vars.css';\nimport './styles/base.css';\nimport './styles/icons.css';\nimport './styles/utils.css';\nimport './styles/components/custom-block.css';\nimport './styles/components/vp-code.css';\nimport './styles/components/vp-code-group.css';\nimport './styles/components/vp-doc.css';\nimport './styles/components/vp-sponsor.css';\nimport VPBadge from './components/VPBadge.vue';\nimport Layout from './Layout.vue';\nexport { default as VPBadge } from './components/VPBadge.vue';\nexport { default as VPButton } from './components/VPButton.vue';\nexport { default as VPDocAsideSponsors } from './components/VPDocAsideSponsors.vue';\nexport { default as VPFeatures } from './components/VPFeatures.vue';\nexport { default as VPHomeContent } from './components/VPHomeContent.vue';\nexport { default as VPHomeFeatures } from './components/VPHomeFeatures.vue';\nexport { default as VPHomeHero } from './components/VPHomeHero.vue';\nexport { default as VPHomeSponsors } from './components/VPHomeSponsors.vue';\nexport { default as VPImage } from './components/VPImage.vue';\nexport { default as VPLink } from './components/VPLink.vue';\nexport { default as VPNavBarSearch } from './components/VPNavBarSearch.vue';\nexport { default as VPSocialLink } from './components/VPSocialLink.vue';\nexport { default as VPSocialLinks } from './components/VPSocialLinks.vue';\nexport { default as VPSponsors } from './components/VPSponsors.vue';\nexport { default as VPTeamMembers } from './components/VPTeamMembers.vue';\nexport { default as VPTeamPage } from './components/VPTeamPage.vue';\nexport { default as VPTeamPageSection } from './components/VPTeamPageSection.vue';\nexport { default as VPTeamPageTitle } from './components/VPTeamPageTitle.vue';\nexport { useLocalNav } from './composables/local-nav';\nexport { useSidebar } from './composables/sidebar';\nconst theme = {\n    Layout,\n    enhanceApp: ({ app }) => {\n        app.component('Badge', VPBadge);\n    }\n};\nexport default theme;\n", "import { onContentUpdated } from 'vitepress';\nimport { computed, shallowRef } from 'vue';\nimport { getHeaders } from '../composables/outline';\nimport { useData } from './data';\nexport function useLocalNav() {\n    const { theme, frontmatter } = useData();\n    const headers = shallowRef([]);\n    const hasLocalNav = computed(() => {\n        return headers.value.length > 0;\n    });\n    onContentUpdated(() => {\n        headers.value = getHeaders(frontmatter.value.outline ?? theme.value.outline);\n    });\n    return {\n        headers,\n        hasLocalNav\n    };\n}\n", "import { getScrollOffset } from 'vitepress';\nimport { onMounted, onUnmounted, onUpdated } from 'vue';\nimport { throttleAndDebounce } from '../support/utils';\nimport { useAside } from './aside';\nconst ignoreRE = /\\b(?:VPBadge|header-anchor|footnote-ref|ignore-header)\\b/;\n// cached list of anchor elements from resolveHeaders\nconst resolvedHeaders = [];\nexport function resolveTitle(theme) {\n    return ((typeof theme.outline === 'object' &&\n        !Array.isArray(theme.outline) &&\n        theme.outline.label) ||\n        theme.outlineTitle ||\n        'On this page');\n}\nexport function getHeaders(range) {\n    const headers = [\n        ...document.querySelectorAll('.VPDoc :where(h1,h2,h3,h4,h5,h6)')\n    ]\n        .filter((el) => el.id && el.hasChildNodes())\n        .map((el) => {\n        const level = Number(el.tagName[1]);\n        return {\n            element: el,\n            title: serializeHeader(el),\n            link: '#' + el.id,\n            level\n        };\n    });\n    return resolveHeaders(headers, range);\n}\nfunction serializeHeader(h) {\n    let ret = '';\n    for (const node of h.childNodes) {\n        if (node.nodeType === 1) {\n            if (ignoreRE.test(node.className))\n                continue;\n            ret += node.textContent;\n        }\n        else if (node.nodeType === 3) {\n            ret += node.textContent;\n        }\n    }\n    return ret.trim();\n}\nexport function resolveHeaders(headers, range) {\n    if (range === false) {\n        return [];\n    }\n    const levelsRange = (typeof range === 'object' && !Array.isArray(range)\n        ? range.level\n        : range) || 2;\n    const [high, low] = typeof levelsRange === 'number'\n        ? [levelsRange, levelsRange]\n        : levelsRange === 'deep'\n            ? [2, 6]\n            : levelsRange;\n    return buildTree(headers, high, low);\n}\nexport function useActiveAnchor(container, marker) {\n    const { isAsideEnabled } = useAside();\n    const onScroll = throttleAndDebounce(setActiveLink, 100);\n    let prevActiveLink = null;\n    onMounted(() => {\n        requestAnimationFrame(setActiveLink);\n        window.addEventListener('scroll', onScroll);\n    });\n    onUpdated(() => {\n        // sidebar update means a route change\n        activateLink(location.hash);\n    });\n    onUnmounted(() => {\n        window.removeEventListener('scroll', onScroll);\n    });\n    function setActiveLink() {\n        if (!isAsideEnabled.value) {\n            return;\n        }\n        const scrollY = window.scrollY;\n        const innerHeight = window.innerHeight;\n        const offsetHeight = document.body.offsetHeight;\n        const isBottom = Math.abs(scrollY + innerHeight - offsetHeight) < 1;\n        // resolvedHeaders may be repositioned, hidden or fix positioned\n        const headers = resolvedHeaders\n            .map(({ element, link }) => ({\n            link,\n            top: getAbsoluteTop(element)\n        }))\n            .filter(({ top }) => !Number.isNaN(top))\n            .sort((a, b) => a.top - b.top);\n        // no headers available for active link\n        if (!headers.length) {\n            activateLink(null);\n            return;\n        }\n        // page top\n        if (scrollY < 1) {\n            activateLink(null);\n            return;\n        }\n        // page bottom - highlight last link\n        if (isBottom) {\n            activateLink(headers[headers.length - 1].link);\n            return;\n        }\n        // find the last header above the top of viewport\n        let activeLink = null;\n        for (const { link, top } of headers) {\n            if (top > scrollY + getScrollOffset() + 4) {\n                break;\n            }\n            activeLink = link;\n        }\n        activateLink(activeLink);\n    }\n    function activateLink(hash) {\n        if (prevActiveLink) {\n            prevActiveLink.classList.remove('active');\n        }\n        if (hash == null) {\n            prevActiveLink = null;\n        }\n        else {\n            prevActiveLink = container.value.querySelector(`a[href=\"${decodeURIComponent(hash)}\"]`);\n        }\n        const activeLink = prevActiveLink;\n        if (activeLink) {\n            activeLink.classList.add('active');\n            marker.value.style.top = activeLink.offsetTop + 39 + 'px';\n            marker.value.style.opacity = '1';\n        }\n        else {\n            marker.value.style.top = '33px';\n            marker.value.style.opacity = '0';\n        }\n    }\n}\nfunction getAbsoluteTop(element) {\n    let offsetTop = 0;\n    while (element !== document.body) {\n        if (element === null) {\n            // child element is:\n            // - not attached to the DOM (display: none)\n            // - set to fixed position (not scrollable)\n            // - body or html element (null offsetParent)\n            return NaN;\n        }\n        offsetTop += element.offsetTop;\n        element = element.offsetParent;\n    }\n    return offsetTop;\n}\nfunction buildTree(data, min, max) {\n    resolvedHeaders.length = 0;\n    const result = [];\n    const stack = [];\n    data.forEach((item) => {\n        const node = { ...item, children: [] };\n        let parent = stack[stack.length - 1];\n        while (parent && parent.level >= node.level) {\n            stack.pop();\n            parent = stack[stack.length - 1];\n        }\n        if (node.element.classList.contains('ignore-header') ||\n            (parent && 'shouldIgnore' in parent)) {\n            stack.push({ level: node.level, shouldIgnore: true });\n            return;\n        }\n        if (node.level > max || node.level < min)\n            return;\n        resolvedHeaders.push({ element: node.element, link: node.link });\n        if (parent)\n            parent.children.push(node);\n        else\n            result.push(node);\n        stack.push(node);\n    });\n    return result;\n}\n", "import { withBase } from 'vitepress';\nimport { isExternal, treatAsHtml } from '../../shared';\nimport { useData } from '../composables/data';\nexport function throttleAndDebounce(fn, delay) {\n    let timeoutId;\n    let called = false;\n    return () => {\n        if (timeoutId)\n            clearTimeout(timeoutId);\n        if (!called) {\n            fn();\n            (called = true) && setTimeout(() => (called = false), delay);\n        }\n        else\n            timeoutId = setTimeout(fn, delay);\n    };\n}\nexport function ensureStartingSlash(path) {\n    return path.startsWith('/') ? path : `/${path}`;\n}\nexport function normalizeLink(url) {\n    const { pathname, search, hash, protocol } = new URL(url, 'http://a.com');\n    if (isExternal(url) ||\n        url.startsWith('#') ||\n        !protocol.startsWith('http') ||\n        !treatAsHtml(pathname))\n        return url;\n    const { site } = useData();\n    const normalizedPath = pathname.endsWith('/') || pathname.endsWith('.html')\n        ? url\n        : url.replace(/(?:(^\\.+)\\/)?.*$/, `$1${pathname.replace(/(\\.md)?$/, site.value.cleanUrls ? '' : '.html')}${search}${hash}`);\n    return withBase(normalizedPath);\n}\n", "import { useData as useData$ } from 'vitepress';\nexport const useData = useData$;\n", "import { isActive } from '../../shared';\nimport { ensureStartingSlash } from './utils';\n/**\n * Get the `Sidebar` from sidebar option. This method will ensure to get correct\n * sidebar config from `MultiSideBarConfig` with various path combinations such\n * as matching `guide/` and `/guide/`. If no matching config was found, it will\n * return empty array.\n */\nexport function getSidebar(_sidebar, path) {\n    if (Array.isArray(_sidebar))\n        return addBase(_sidebar);\n    if (_sidebar == null)\n        return [];\n    path = ensureStartingSlash(path);\n    const dir = Object.keys(_sidebar)\n        .sort((a, b) => {\n        return b.split('/').length - a.split('/').length;\n    })\n        .find((dir) => {\n        // make sure the multi sidebar key starts with slash too\n        return path.startsWith(ensureStartingSlash(dir));\n    });\n    const sidebar = dir ? _sidebar[dir] : [];\n    return Array.isArray(sidebar)\n        ? addBase(sidebar)\n        : addBase(sidebar.items, sidebar.base);\n}\n/**\n * Get or generate sidebar group from the given sidebar items.\n */\nexport function getSidebarGroups(sidebar) {\n    const groups = [];\n    let lastGroupIndex = 0;\n    for (const index in sidebar) {\n        const item = sidebar[index];\n        if (item.items) {\n            lastGroupIndex = groups.push(item);\n            continue;\n        }\n        if (!groups[lastGroupIndex]) {\n            groups.push({ items: [] });\n        }\n        groups[lastGroupIndex].items.push(item);\n    }\n    return groups;\n}\nexport function getFlatSideBarLinks(sidebar) {\n    const links = [];\n    function recursivelyExtractLinks(items) {\n        for (const item of items) {\n            if (item.text && item.link) {\n                links.push({\n                    text: item.text,\n                    link: item.link,\n                    docFooterText: item.docFooterText\n                });\n            }\n            if (item.items) {\n                recursivelyExtractLinks(item.items);\n            }\n        }\n    }\n    recursivelyExtractLinks(sidebar);\n    return links;\n}\n/**\n * Check if the given sidebar item contains any active link.\n */\nexport function hasActiveLink(path, items) {\n    if (Array.isArray(items)) {\n        return items.some((item) => hasActiveLink(path, item));\n    }\n    return isActive(path, items.link)\n        ? true\n        : items.items\n            ? hasActiveLink(path, items.items)\n            : false;\n}\nfunction addBase(items, _base) {\n    return [...items].map((_item) => {\n        const item = { ..._item };\n        const base = item.base || _base;\n        if (base && item.link)\n            item.link = base + item.link;\n        if (item.items)\n            item.items = addBase(item.items, base);\n        return item;\n    });\n}\n", "import { useMediaQuery } from '@vueuse/core';\nimport { computed, onMounted, onUnmounted, ref, watch, watchEffect, watchPostEffect } from 'vue';\nimport { isActive } from '../../shared';\nimport { hasActiveLink as containsActiveLink, getSidebar, getSidebarGroups } from '../support/sidebar';\nimport { useData } from './data';\nexport function useSidebar() {\n    const { frontmatter, page, theme } = useData();\n    const is960 = useMediaQuery('(min-width: 960px)');\n    const isOpen = ref(false);\n    const _sidebar = computed(() => {\n        const sidebarConfig = theme.value.sidebar;\n        const relativePath = page.value.relativePath;\n        return sidebarConfig ? getSidebar(sidebarConfig, relativePath) : [];\n    });\n    const sidebar = ref(_sidebar.value);\n    watch(_sidebar, (next, prev) => {\n        if (JSON.stringify(next) !== JSON.stringify(prev))\n            sidebar.value = _sidebar.value;\n    });\n    const hasSidebar = computed(() => {\n        return (frontmatter.value.sidebar !== false &&\n            sidebar.value.length > 0 &&\n            frontmatter.value.layout !== 'home');\n    });\n    const leftAside = computed(() => {\n        if (hasAside)\n            return frontmatter.value.aside == null\n                ? theme.value.aside === 'left'\n                : frontmatter.value.aside === 'left';\n        return false;\n    });\n    const hasAside = computed(() => {\n        if (frontmatter.value.layout === 'home')\n            return false;\n        if (frontmatter.value.aside != null)\n            return !!frontmatter.value.aside;\n        return theme.value.aside !== false;\n    });\n    const isSidebarEnabled = computed(() => hasSidebar.value && is960.value);\n    const sidebarGroups = computed(() => {\n        return hasSidebar.value ? getSidebarGroups(sidebar.value) : [];\n    });\n    function open() {\n        isOpen.value = true;\n    }\n    function close() {\n        isOpen.value = false;\n    }\n    function toggle() {\n        isOpen.value ? close() : open();\n    }\n    return {\n        isOpen,\n        sidebar,\n        sidebarGroups,\n        hasSidebar,\n        hasAside,\n        leftAside,\n        isSidebarEnabled,\n        open,\n        close,\n        toggle\n    };\n}\n/**\n * a11y: cache the element that opened the Sidebar (the menu button) then\n * focus that button again when Menu is closed with Escape key.\n */\nexport function useCloseSidebarOnEscape(isOpen, close) {\n    let triggerElement;\n    watchEffect(() => {\n        triggerElement = isOpen.value\n            ? document.activeElement\n            : undefined;\n    });\n    onMounted(() => {\n        window.addEventListener('keyup', onEscape);\n    });\n    onUnmounted(() => {\n        window.removeEventListener('keyup', onEscape);\n    });\n    function onEscape(e) {\n        if (e.key === 'Escape' && isOpen.value) {\n            close();\n            triggerElement?.focus();\n        }\n    }\n}\nexport function useSidebarControl(item) {\n    const { page, hash } = useData();\n    const collapsed = ref(false);\n    const collapsible = computed(() => {\n        return item.value.collapsed != null;\n    });\n    const isLink = computed(() => {\n        return !!item.value.link;\n    });\n    const isActiveLink = ref(false);\n    const updateIsActiveLink = () => {\n        isActiveLink.value = isActive(page.value.relativePath, item.value.link);\n    };\n    watch([page, item, hash], updateIsActiveLink);\n    onMounted(updateIsActiveLink);\n    const hasActiveLink = computed(() => {\n        if (isActiveLink.value) {\n            return true;\n        }\n        return item.value.items\n            ? containsActiveLink(page.value.relativePath, item.value.items)\n            : false;\n    });\n    const hasChildren = computed(() => {\n        return !!(item.value.items && item.value.items.length);\n    });\n    watchEffect(() => {\n        collapsed.value = !!(collapsible.value && item.value.collapsed);\n    });\n    watchPostEffect(() => {\n        ;\n        (isActiveLink.value || hasActiveLink.value) && (collapsed.value = false);\n    });\n    function toggle() {\n        if (collapsible.value) {\n            collapsed.value = !collapsed.value;\n        }\n    }\n    return {\n        collapsed,\n        collapsible,\n        isLink,\n        isActiveLink,\n        hasActiveLink,\n        hasChildren,\n        toggle\n    };\n}\n"],
-  "mappings": ";;;;;;;;;;;AAAA,OAAO;;;ACAP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO;AACP,OAAO,aAAa;AACpB,OAAO,YAAY;AACnB,SAAoB,WAAXA,gBAA0B;AACnC,SAAoB,WAAXA,gBAA2B;AACpC,SAAoB,WAAXA,gBAAqC;AAC9C,SAAoB,WAAXA,gBAA6B;AACtC,SAAoB,WAAXA,gBAAgC;AACzC,SAAoB,WAAXA,gBAAiC;AAC1C,SAAoB,WAAXA,gBAA6B;AACtC,SAAoB,WAAXA,gBAAiC;AAC1C,SAAoB,WAAXA,iBAA0B;AACnC,SAAoB,WAAXA,iBAAyB;AAClC,SAAoB,WAAXA,iBAAiC;AAC1C,SAAoB,WAAXA,iBAA+B;AACxC,SAAoB,WAAXA,iBAAgC;AACzC,SAAoB,WAAXA,iBAA6B;AACtC,SAAoB,WAAXA,iBAAgC;AACzC,SAAoB,WAAXA,iBAA6B;AACtC,SAAoB,WAAXA,iBAAoC;AAC7C,SAAoB,WAAXA,iBAAkC;;;AC5B3C,SAAS,wBAAwB;;;ACAjC,SAAS,uBAAuB;;;ACAhC,SAAS,gBAAgB;;;ACAzB,SAAS,WAAW,gBAAgB;AAC7B,IAAM,UAAU;;;ADgBhB,SAAS,oBAAoB,MAAM;AACtC,SAAO,KAAK,WAAW,GAAG,IAAI,OAAO,IAAI,IAAI;AACjD;;;AEXO,SAAS,WAAW,UAAU,MAAM;AACvC,MAAI,MAAM,QAAQ,QAAQ;AACtB,WAAO,QAAQ,QAAQ;AAC3B,MAAI,YAAY;AACZ,WAAO,CAAC;AACZ,SAAO,oBAAoB,IAAI;AAC/B,QAAM,MAAM,OAAO,KAAK,QAAQ,EAC3B,KAAK,CAAC,GAAG,MAAM;AAChB,WAAO,EAAE,MAAM,GAAG,EAAE,SAAS,EAAE,MAAM,GAAG,EAAE;AAAA,EAC9C,CAAC,EACI,KAAK,CAACC,SAAQ;AAEf,WAAO,KAAK,WAAW,oBAAoBA,IAAG,CAAC;AAAA,EACnD,CAAC;AACD,QAAM,UAAU,MAAM,SAAS,GAAG,IAAI,CAAC;AACvC,SAAO,MAAM,QAAQ,OAAO,IACtB,QAAQ,OAAO,IACf,QAAQ,QAAQ,OAAO,QAAQ,IAAI;AAC7C;AAIO,SAAS,iBAAiB,SAAS;AACtC,QAAM,SAAS,CAAC;AAChB,MAAI,iBAAiB;AACrB,aAAW,SAAS,SAAS;AACzB,UAAM,OAAO,QAAQ,KAAK;AAC1B,QAAI,KAAK,OAAO;AACZ,uBAAiB,OAAO,KAAK,IAAI;AACjC;AAAA,IACJ;AACA,QAAI,CAAC,OAAO,cAAc,GAAG;AACzB,aAAO,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC;AAAA,IAC7B;AACA,WAAO,cAAc,EAAE,MAAM,KAAK,IAAI;AAAA,EAC1C;AACA,SAAO;AACX;AAiCA,SAAS,QAAQ,OAAO,OAAO;AAC3B,SAAO,CAAC,GAAG,KAAK,EAAE,IAAI,CAAC,UAAU;AAC7B,UAAM,OAAO,EAAE,GAAG,MAAM;AACxB,UAAM,OAAO,KAAK,QAAQ;AAC1B,QAAI,QAAQ,KAAK;AACb,WAAK,OAAO,OAAO,KAAK;AAC5B,QAAI,KAAK;AACL,WAAK,QAAQ,QAAQ,KAAK,OAAO,IAAI;AACzC,WAAO;AAAA,EACX,CAAC;AACL;;;ACnFO,SAAS,aAAa;AACzB,QAAM,EAAE,aAAa,MAAM,OAAAC,OAAM,IAAI,QAAQ;AAC7C,QAAM,QAAQ,cAAc,oBAAoB;AAChD,QAAM,SAAS,IAAI,KAAK;AACxB,QAAM,WAAW,SAAS,MAAM;AAC5B,UAAM,gBAAgBA,OAAM,MAAM;AAClC,UAAM,eAAe,KAAK,MAAM;AAChC,WAAO,gBAAgB,WAAW,eAAe,YAAY,IAAI,CAAC;AAAA,EACtE,CAAC;AACD,QAAM,UAAU,IAAI,SAAS,KAAK;AAClC,QAAM,UAAU,CAAC,MAAM,SAAS;AAC5B,QAAI,KAAK,UAAU,IAAI,MAAM,KAAK,UAAU,IAAI;AAC5C,cAAQ,QAAQ,SAAS;AAAA,EACjC,CAAC;AACD,QAAM,aAAa,SAAS,MAAM;AAC9B,WAAQ,YAAY,MAAM,YAAY,SAClC,QAAQ,MAAM,SAAS,KACvB,YAAY,MAAM,WAAW;AAAA,EACrC,CAAC;AACD,QAAM,YAAY,SAAS,MAAM;AAC7B,QAAI;AACA,aAAO,YAAY,MAAM,SAAS,OAC5BA,OAAM,MAAM,UAAU,SACtB,YAAY,MAAM,UAAU;AACtC,WAAO;AAAA,EACX,CAAC;AACD,QAAM,WAAW,SAAS,MAAM;AAC5B,QAAI,YAAY,MAAM,WAAW;AAC7B,aAAO;AACX,QAAI,YAAY,MAAM,SAAS;AAC3B,aAAO,CAAC,CAAC,YAAY,MAAM;AAC/B,WAAOA,OAAM,MAAM,UAAU;AAAA,EACjC,CAAC;AACD,QAAM,mBAAmB,SAAS,MAAM,WAAW,SAAS,MAAM,KAAK;AACvE,QAAM,gBAAgB,SAAS,MAAM;AACjC,WAAO,WAAW,QAAQ,iBAAiB,QAAQ,KAAK,IAAI,CAAC;AAAA,EACjE,CAAC;AACD,WAAS,OAAO;AACZ,WAAO,QAAQ;AAAA,EACnB;AACA,WAAS,QAAQ;AACb,WAAO,QAAQ;AAAA,EACnB;AACA,WAAS,SAAS;AACd,WAAO,QAAQ,MAAM,IAAI,KAAK;AAAA,EAClC;AACA,SAAO;AAAA,IACH;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACJ;AACJ;;;AJ3DA,IAAM,WAAW;AAEjB,IAAM,kBAAkB,CAAC;AAQlB,SAAS,WAAW,OAAO;AAC9B,QAAM,UAAU;AAAA,IACZ,GAAG,SAAS,iBAAiB,kCAAkC;AAAA,EACnE,EACK,OAAO,CAAC,OAAO,GAAG,MAAM,GAAG,cAAc,CAAC,EAC1C,IAAI,CAAC,OAAO;AACb,UAAM,QAAQ,OAAO,GAAG,QAAQ,CAAC,CAAC;AAClC,WAAO;AAAA,MACH,SAAS;AAAA,MACT,OAAO,gBAAgB,EAAE;AAAA,MACzB,MAAM,MAAM,GAAG;AAAA,MACf;AAAA,IACJ;AAAA,EACJ,CAAC;AACD,SAAO,eAAe,SAAS,KAAK;AACxC;AACA,SAAS,gBAAgB,GAAG;AACxB,MAAI,MAAM;AACV,aAAW,QAAQ,EAAE,YAAY;AAC7B,QAAI,KAAK,aAAa,GAAG;AACrB,UAAI,SAAS,KAAK,KAAK,SAAS;AAC5B;AACJ,aAAO,KAAK;AAAA,IAChB,WACS,KAAK,aAAa,GAAG;AAC1B,aAAO,KAAK;AAAA,IAChB;AAAA,EACJ;AACA,SAAO,IAAI,KAAK;AACpB;AACO,SAAS,eAAe,SAAS,OAAO;AAC3C,MAAI,UAAU,OAAO;AACjB,WAAO,CAAC;AAAA,EACZ;AACA,QAAM,eAAe,OAAO,UAAU,YAAY,CAAC,MAAM,QAAQ,KAAK,IAChE,MAAM,QACN,UAAU;AAChB,QAAM,CAAC,MAAM,GAAG,IAAI,OAAO,gBAAgB,WACrC,CAAC,aAAa,WAAW,IACzB,gBAAgB,SACZ,CAAC,GAAG,CAAC,IACL;AACV,SAAO,UAAU,SAAS,MAAM,GAAG;AACvC;AA8FA,SAAS,UAAU,MAAM,KAAK,KAAK;AAC/B,kBAAgB,SAAS;AACzB,QAAM,SAAS,CAAC;AAChB,QAAM,QAAQ,CAAC;AACf,OAAK,QAAQ,CAAC,SAAS;AACnB,UAAM,OAAO,EAAE,GAAG,MAAM,UAAU,CAAC,EAAE;AACrC,QAAI,SAAS,MAAM,MAAM,SAAS,CAAC;AACnC,WAAO,UAAU,OAAO,SAAS,KAAK,OAAO;AACzC,YAAM,IAAI;AACV,eAAS,MAAM,MAAM,SAAS,CAAC;AAAA,IACnC;AACA,QAAI,KAAK,QAAQ,UAAU,SAAS,eAAe,KAC9C,UAAU,kBAAkB,QAAS;AACtC,YAAM,KAAK,EAAE,OAAO,KAAK,OAAO,cAAc,KAAK,CAAC;AACpD;AAAA,IACJ;AACA,QAAI,KAAK,QAAQ,OAAO,KAAK,QAAQ;AACjC;AACJ,oBAAgB,KAAK,EAAE,SAAS,KAAK,SAAS,MAAM,KAAK,KAAK,CAAC;AAC/D,QAAI;AACA,aAAO,SAAS,KAAK,IAAI;AAAA;AAEzB,aAAO,KAAK,IAAI;AACpB,UAAM,KAAK,IAAI;AAAA,EACnB,CAAC;AACD,SAAO;AACX;;;AD7KO,SAAS,cAAc;AAC1B,QAAM,EAAE,OAAAC,QAAO,YAAY,IAAI,QAAQ;AACvC,QAAM,UAAU,WAAW,CAAC,CAAC;AAC7B,QAAM,cAAc,SAAS,MAAM;AAC/B,WAAO,QAAQ,MAAM,SAAS;AAAA,EAClC,CAAC;AACD,mBAAiB,MAAM;AACnB,YAAQ,QAAQ,WAAW,YAAY,MAAM,WAAWA,OAAM,MAAM,OAAO;AAAA,EAC/E,CAAC;AACD,SAAO;AAAA,IACH;AAAA,IACA;AAAA,EACJ;AACJ;;;ADcA,IAAM,QAAQ;AAAA,EACV;AAAA,EACA,YAAY,CAAC,EAAE,IAAI,MAAM;AACrB,QAAI,UAAU,SAAS,OAAO;AAAA,EAClC;AACJ;AACA,IAAO,wBAAQ;",
-  "names": ["default", "dir", "theme", "theme"]
-}
diff --git a/docs/src/.vitepress/cache/deps/_metadata.json b/docs/src/.vitepress/cache/deps/_metadata.json
index 5a30fbcb..11606a15 100644
--- a/docs/src/.vitepress/cache/deps/_metadata.json
+++ b/docs/src/.vitepress/cache/deps/_metadata.json
@@ -1,40 +1,61 @@
 {
-  "hash": "24ae7914",
-  "configHash": "4d8f23bf",
-  "lockfileHash": "f40a324f",
-  "browserHash": "57cac89d",
+  "hash": "f4c42eef",
+  "configHash": "06043327",
+  "lockfileHash": "a6108897",
+  "browserHash": "67e7b8f5",
   "optimized": {
     "vue": {
-      "src": "../../../../../node_modules/.pnpm/vue@3.5.14_typescript@5.8.3/node_modules/vue/dist/vue.runtime.esm-bundler.js",
+      "src": "../../../../node_modules/vue/dist/vue.runtime.esm-bundler.js",
       "file": "vue.js",
-      "fileHash": "4d545f98",
+      "fileHash": "f6ee4df0",
       "needsInterop": false
     },
     "vitepress > @vue/devtools-api": {
-      "src": "../../../../../node_modules/.pnpm/@vue+devtools-api@7.7.6/node_modules/@vue/devtools-api/dist/index.js",
+      "src": "../../../../node_modules/@vue/devtools-api/dist/index.js",
       "file": "vitepress___@vue_devtools-api.js",
-      "fileHash": "0eb634c2",
+      "fileHash": "17bae2c9",
       "needsInterop": false
     },
     "vitepress > @vueuse/core": {
-      "src": "../../../../../node_modules/.pnpm/@vueuse+core@12.8.2_typescript@5.8.3/node_modules/@vueuse/core/index.mjs",
+      "src": "../../../../node_modules/@vueuse/core/index.mjs",
       "file": "vitepress___@vueuse_core.js",
-      "fileHash": "a207eb3c",
+      "fileHash": "d650fb38",
       "needsInterop": false
     },
-    "@theme/index": {
-      "src": "../../../../../node_modules/.pnpm/vitepress@1.6.3_@algolia+client-search@5.25.0_@types+node@22.15.18_@types+react@18.3.21_postc_a2ow5vd3dm2t7inebqftg4t7xi/node_modules/vitepress/dist/client/theme-default/index.js",
-      "file": "@theme_index.js",
-      "fileHash": "8e216fe2",
+    "@vue/shared": {
+      "src": "../../../../node_modules/@vue/shared/dist/shared.esm-bundler.js",
+      "file": "@vue_shared.js",
+      "fileHash": "f90b9ade",
+      "needsInterop": false
+    },
+    "vitepress > @vueuse/integrations/useFocusTrap": {
+      "src": "../../../../node_modules/@vueuse/integrations/useFocusTrap.mjs",
+      "file": "vitepress___@vueuse_integrations_useFocusTrap.js",
+      "fileHash": "51780127",
+      "needsInterop": false
+    },
+    "vitepress > mark.js/src/vanilla.js": {
+      "src": "../../../../node_modules/mark.js/src/vanilla.js",
+      "file": "vitepress___mark__js_src_vanilla__js.js",
+      "fileHash": "312e849a",
+      "needsInterop": false
+    },
+    "vitepress > minisearch": {
+      "src": "../../../../node_modules/minisearch/dist/es/index.js",
+      "file": "vitepress___minisearch.js",
+      "fileHash": "6e8437ee",
       "needsInterop": false
     }
   },
   "chunks": {
-    "chunk-2DFNRHEN": {
-      "file": "chunk-2DFNRHEN.js"
+    "chunk-IDCUKJPY": {
+      "file": "chunk-IDCUKJPY.js"
+    },
+    "chunk-T4BGSLFB": {
+      "file": "chunk-T4BGSLFB.js"
     },
-    "chunk-IUSDUMZG": {
-      "file": "chunk-IUSDUMZG.js"
+    "chunk-R5RQUVAY": {
+      "file": "chunk-R5RQUVAY.js"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/docs/src/.vitepress/config.ts b/docs/src/.vitepress/config.ts
index 9b1b90cc..02eb6117 100644
--- a/docs/src/.vitepress/config.ts
+++ b/docs/src/.vitepress/config.ts
@@ -79,19 +79,12 @@ export default defineConfig({
           collapsed: false,
           items: [
             { text: 'Overview', link: '/guide/client/overview' },
-            { text: 'ResourceRenderer', link: '/guide/client/resource-renderer' },
-            { text: 'HtmlResource', link: '/guide/client/html-resource' },
-            { text: 'RemoteDomResource', link: '/guide/client/remote-dom-resource' },
+            { text: 'UIResourceRenderer', link: '/guide/client/resource-renderer' },
+            { text: 'HTMLResourceRenderer', link: '/guide/client/html-resource' },
+            { text: 'RemoteDOMResourceRenderer', link: '/guide/client/remote-dom-resource' },
             { text: 'Usage & Examples', link: '/guide/client/usage-examples' },
           ],
         },
-        {
-          text: 'Shared SDK',
-          collapsed: false,
-          items: [
-            { text: 'Overview', link: '/guide/shared/overview' },
-          ],
-        },
       ],
     },
 
diff --git a/docs/src/guide/client/html-resource.md b/docs/src/guide/client/html-resource.md
index cb5f6496..caf17bfc 100644
--- a/docs/src/guide/client/html-resource.md
+++ b/docs/src/guide/client/html-resource.md
@@ -1,15 +1,15 @@
-# HtmlResource Component
+# HTMLResourceRenderer Component
 
-The `<HtmlResource />` component is an internal component used by `<ResourceRenderer />` to render HTML and URL-based resources.
+The `<HTMLResourceRenderer />` component is an internal component used by `<UIResourceRenderer />` to render HTML and URL-based resources.
 
 ## Props
 
 ```typescript
 import type { Resource } from '@modelcontextprotocol/sdk/types';
 
-export interface HtmlResourceProps {
+export interface HTMLResourceRendererProps {
   resource: Partial<Resource>;
-  onUiAction?: (result: UiActionResult) => Promise<any>;
+  onUIAction?: (result: UIActionResult) => Promise<any>;
   style?: React.CSSProperties;
   iframeProps?: Omit<React.HTMLAttributes<HTMLIFrameElement>, 'src' | 'srcDoc' | 'ref' | 'style'>;
 }
@@ -17,8 +17,8 @@ export interface HtmlResourceProps {
 
 The component accepts the following props:
 
-- **`resource`**: The resource object from an `HtmlResourceBlock`. It should include `uri`, `mimeType`, and either `text` or `blob`.
-- **`onUiAction`**: An optional callback that fires when the iframe content (for `ui://` resources) posts a message to your app. The message should look like:
+- **`resource`**: The resource object from an `UIResource`. It should include `uri`, `mimeType`, and either `text` or `blob`.
+- **`onUIAction`**: An optional callback that fires when the iframe content (for `ui://` resources) posts a message to your app. The message should look like:
   ```typescript
   { type: 'tool', payload: { toolName: string, params: Record<string, unknown> } } |
   { type: 'intent', payload: { intent: string, params: Record<string, unknown> } } |
@@ -47,7 +47,7 @@ The component accepts the following props:
       - If using `blob`, it decodes it from Base64.
       - Renders an `<iframe>` with its `srcdoc` set to the HTML.
       - Sandbox: `allow-scripts`.
-3.  **Listens for Messages**: Adds a global `message` event listener. If an iframe posts a message with `event.data.tool`, your `onUiAction` callback is called.
+3.  **Listens for Messages**: Adds a global `message` event listener. If an iframe posts a message with `event.data.tool`, your `onUIAction` callback is called.
 
 ## Styling
 
@@ -55,7 +55,7 @@ By default, the iframe stretches to 100% width and is at least 200px tall. You c
 
 ## Example Usage
 
-See [Client SDK Usage & Examples](./usage-examples.md) for examples using the recommended `<ResourceRenderer />` component.
+See [Client SDK Usage & Examples](./usage-examples.md) for examples using the recommended `<UIResourceRenderer />` component.
 
 ## Security Notes
 
diff --git a/docs/src/guide/client/overview.md b/docs/src/guide/client/overview.md
index 3e988770..d0b82be9 100644
--- a/docs/src/guide/client/overview.md
+++ b/docs/src/guide/client/overview.md
@@ -1,18 +1,18 @@
 # @mcp-ui/client Overview
 
-The `@mcp-ui/client` package helps you render UI resources sent from an MCP-enabled server. The primary component for this is `<ResourceRenderer />`, which automatically detects the resource type and renders the appropriate component for it.
+The `@mcp-ui/client` package helps you render UI resources sent from an MCP-enabled server. The primary component for this is `<UIResourceRenderer />`, which automatically detects the resource type and renders the appropriate component for it.
 
 ## What's Included?
 
-- **`<ResourceRenderer />`**: The main component you'll use. It inspects the resource's `mimeType` and renders either `<HtmlResource />` or `<RemoteDomResource />` internally.
-- **`<HtmlResource />`**: Internal component for HTML/URL resources
-- **`<RemoteDomResource />`**: Internal component for remote DOM resources
+- **`<UIResourceRenderer />`**: The main component you'll use. It inspects the resource's `mimeType` and renders either `<HTMLResourceRenderer />` or `<RemoteDOMResourceRenderer />` internally.
+- **`<HTMLResourceRenderer />`**: Internal component for HTML/URL resources
+- **`<RemoteDOMResourceRenderer />`**: Internal component for remote DOM resources
 
 ## Purpose
 - **Standardized UI**: mcp-ui's client guarantees full compatibility with the latest MCP UI standards.
 - **Simplified Rendering**: Abstract away the complexities of handling different resource types.
 - **Security**: Renders user-provided HTML and scripts within sandboxed iframes.
-- **Interactivity**: Provides a unified mechanism (`onUiAction` prop) for UI resources to communicate back to the host application.
+- **Interactivity**: Provides a unified mechanism (`onUIAction` prop) for UI resources to communicate back to the host application.
 
 ## Building
 
@@ -26,7 +26,7 @@ pnpm build --filter @mcp-ui/client
 
 See the following pages for more details:
 
-- [ResourceRenderer Component](./resource-renderer.md) - **Main entry point**
-- [HtmlResource Component](./html-resource.md)
-- [RemoteDomResource Component](./remote-dom-resource.md)
+- [UIResourceRenderer Component](./resource-renderer.md) - **Main entry point**
+- [HTMLResourceRenderer Component](./html-resource.md)
+- [RemoteDOMResourceRenderer Component](./remote-dom-resource.md)
 - [Client SDK Usage & Examples](./usage-examples.md)
diff --git a/docs/src/guide/client/remote-dom-resource.md b/docs/src/guide/client/remote-dom-resource.md
index 54750191..7dff045c 100644
--- a/docs/src/guide/client/remote-dom-resource.md
+++ b/docs/src/guide/client/remote-dom-resource.md
@@ -1,6 +1,6 @@
-# RemoteDomResource Component
+# RemoteDOMResourceRenderer Component
 
-The `<RemoteDomResource />` component is used to render UI resources with the `application/vnd.mcp-ui.remote-dom` mime type. It leverages Shopify's [`remote-dom`](https://github.com/Shopify/remote-dom) library to securely render host-native components from a server-provided UI description.
+The `<RemoteDOMResourceRenderer />` component is used to render UI resources with the `application/vnd.mcp-ui.remote-dom` mime type. It leverages Shopify's [`remote-dom`](https://github.com/Shopify/remote-dom) library to securely render host-native components from a server-provided UI description.
 
 This approach offers greater flexibility and security compared to `<iframe>`-based HTML resources, enabling UIs that seamlessly integrate with the host application's look and feel.
 
@@ -9,7 +9,7 @@ This approach offers greater flexibility and security compared to `<iframe>`-bas
 1.  The MCP server sends a resource containing a script that builds a "remote" DOM structure.
 2.  The `@mcp-ui/client` securely executes this script in a sandboxed environment (a Web Worker inside an iframe).
 3.  As the remote DOM is manipulated, a series a JSON messages describing the changes are sent to the host window.
-4.  `<RemoteDomResource />` receives these messages and translates them into React component tree updates.
+4.  `<RemoteDOMResourceRenderer />` receives these messages and translates them into React component tree updates.
 
 This ensures that no arbitrary code from the server runs in the main application thread, maintaining security while allowing dynamic and interactive UIs.
 
@@ -17,7 +17,7 @@ This ensures that no arbitrary code from the server runs in the main application
 
 -   **`resource`**: The `resource` object from an MCP message. The `mimeType` must be `application/vnd.mcp-ui.remote-dom+javascript; flavor={react | webcomponents}`.
 -   **`library`**: A component library that maps remote element tag names (e.g., "button") to your host's React components.
--   **`onUiAction`**: A callback function to handle events (e.g., button clicks) initiated from the remote UI.
+-   **`onUIAction`**: A callback function to handle events (e.g., button clicks) initiated from the remote UI.
 
 ## Component Libraries
 
@@ -35,30 +35,30 @@ const customLibrary = new Map([
   ['info-card', MyCard],
 ]);
 
-<RemoteDomResource resource={resource} library={customLibrary} />
+<RemoteDOMResourceRenderer resource={resource} library={customLibrary} />
 ```
 
 If the remote DOM contains `<fancy-button>`, it will be rendered using your `MyButton` component.
 
 ## Usage
 
-The `<ResourceRenderer />` component automatically handles rendering `<RemoteDomResource />` when it detects the correct mime type, so you typically won't use this component directly.
+The `<UIResourceRenderer />` component automatically handles rendering `<RemoteDOMResourceRenderer />` when it detects the correct mime type, so you typically won't use this component directly.
 
 ```tsx
 import React from 'react';
-import { ResourceRenderer } from '@mcp-ui/client';
+import { UIResourceRenderer } from '@mcp-ui/client';
 
 function App({ mcpResource }) {
   if (
     mcpResource.type === 'resource' &&
     mcpResource.resource.uri?.startsWith('ui://')
   ) {
-    // ResourceRenderer will instantiate RemoteDomResource internally
+    // UIResourceRenderer will instantiate RemoteDOMResourceRenderer internally
     // if the resource mimeType is 'application/vnd.mcp-ui.remote-dom'.
     return (
-      <ResourceRenderer
+      <UIResourceRenderer
         resource={mcpResource.resource}
-        onUiAction={(action) => console.log('UI Action:', action)}
+        onUIAction={(action) => console.log('UI Action:', action)}
       />
     );
   }
diff --git a/docs/src/guide/client/resource-renderer.md b/docs/src/guide/client/resource-renderer.md
index f0bbd850..cf4c371d 100644
--- a/docs/src/guide/client/resource-renderer.md
+++ b/docs/src/guide/client/resource-renderer.md
@@ -1,8 +1,8 @@
-# ResourceRenderer Component
+# UIResourceRenderer Component
 
-The `<ResourceRenderer />` component is the **main entry point** for rendering MCP-UI resources in your React application. It automatically detects the resource type and renders the appropriate component internally.
+The `<UIResourceRenderer />` component is the **main entry point** for rendering MCP-UI resources in your React application. It automatically detects the resource type and renders the appropriate component internally.
 
-## Why use `ResourceRenderer`?
+## Why use `UIResourceRenderer`?
 
 - **Automatic Type Detection**: Inspects the resource's `mimeType` and `contentType` to determine the appropriate rendering method
 - **Future-Proof**: Handles new resource types as they're added to the MCP-UI specification
@@ -11,7 +11,7 @@ The `<ResourceRenderer />` component is the **main entry point** for rendering M
 
 ## Supported Resource Types
 
-`ResourceRenderer` automatically handles:
+`UIResourceRenderer` automatically handles:
 
 - **HTML Resources** (`text/html`): Direct HTML content rendered in sandboxed iframes
 - **External URLs** (`text/uri-list`): External applications and websites
@@ -22,9 +22,9 @@ The `<ResourceRenderer />` component is the **main entry point** for rendering M
 ```typescript
 import type { Resource } from '@modelcontextprotocol/sdk/types';
 
-interface ResourceRendererProps {
+interface UIResourceRendererProps {
   resource: Partial<Resource>;
-  onUiAction?: (result: UiActionResult) => Promise<unknown>;
+  onUIAction?: (result: UIActionResult) => Promise<unknown>;
   style?: React.CSSProperties;
   iframeProps?: Omit<React.HTMLAttributes<HTMLIFrameElement>, 'src' | 'srcDoc' | 'ref' | 'style'>;
   library?: ComponentLibrary;
@@ -36,7 +36,7 @@ interface ResourceRendererProps {
 ### Props Details
 
 - **`resource`**: The resource object from an MCP response. Should include `uri`, `mimeType`, and content (`text`, `blob`, or `content`)
-- **`onUiAction`**: Optional callback for handling UI actions from the resource:
+- **`onUIAction`**: Optional callback for handling UI actions from the resource:
   ```typescript
   { type: 'tool', payload: { toolName: string, params: Record<string, unknown> } } |
   { type: 'intent', payload: { intent: string, params: Record<string, unknown> } } |
@@ -54,10 +54,10 @@ interface ResourceRendererProps {
 
 ```tsx
 import React from 'react';
-import { ResourceRenderer, UiActionResult } from '@mcp-ui/client';
+import { UIResourceRenderer, UIActionResult } from '@mcp-ui/client';
 
 function App({ mcpResource }) {
-  const handleUiAction = async (result: UiActionResult) => {
+  const handleUIAction = async (result: UIActionResult) => {
     switch (result.type) {
       case 'tool':
         console.log('Tool call:', result.payload.toolName, result.payload.params);
@@ -88,9 +88,9 @@ function App({ mcpResource }) {
     mcpResource.resource.uri?.startsWith('ui://')
   ) {
     return (
-      <ResourceRenderer
+      <UIResourceRenderer
         resource={mcpResource.resource}
-        onUiAction={handleUiAction}
+        onUIAction={handleUIAction}
       />
     );
   }
@@ -105,10 +105,10 @@ function App({ mcpResource }) {
 
 ```tsx
 // Only allow HTML resources (block external URLs and Remote DOM)
-<ResourceRenderer
+<UIResourceRenderer
   resource={mcpResource.resource}
   supportedContentTypes={['rawHtml']}
-  onUiAction={handleUiAction}
+  onUIAction={handleUIAction}
 />
 ```
 
@@ -126,17 +126,17 @@ const customLibrary: ComponentLibrary = {
   ],
 };
 
-<ResourceRenderer
+<UIResourceRenderer
   resource={mcpResource.resource}
   library={customLibrary}
-  onUiAction={handleUiAction}
+  onUIAction={handleUIAction}
 />
 ```
 
 ### Custom Styling
 
 ```tsx
-<ResourceRenderer
+<UIResourceRenderer
   resource={mcpResource.resource}
   style={{ 
     border: '2px solid #007acc',
@@ -147,13 +147,13 @@ const customLibrary: ComponentLibrary = {
     title: 'Custom MCP Resource',
     className: 'mcp-resource-frame'
   }}
-  onUiAction={handleUiAction}
+  onUIAction={handleUIAction}
 />
 ```
 
 ## Resource Type Detection
 
-`ResourceRenderer` determines the resource type using this logic:
+`UIResourceRenderer` determines the resource type using this logic:
 
 1. **Explicit `contentType`**: If `resource.contentType` is set, use it directly
 2. **MIME Type Detection**:
@@ -173,9 +173,9 @@ function App({ mcpResource }) {
     return (
       <div>
         <h3>MCP Resource: {mcpResource.resource.uri}</h3>
-        <ResourceRenderer
+        <UIResourceRenderer
           resource={mcpResource.resource}
-          onUiAction={handleUiAction}
+          onUIAction={handleUIAction}
           supportedContentTypes={['rawHtml', 'externalUrl']} // Restrict types
         />
       </div>
@@ -186,7 +186,7 @@ function App({ mcpResource }) {
 }
 ```
 
-When unsupported content types are encountered, `ResourceRenderer` will display appropriate error messages:
+When unsupported content types are encountered, `UIResourceRenderer` will display appropriate error messages:
 - `"Unsupported content type: {type}."`
 - `"Unsupported resource type."`
 
diff --git a/docs/src/guide/client/usage-examples.md b/docs/src/guide/client/usage-examples.md
index db1598bc..bbb4c9db 100644
--- a/docs/src/guide/client/usage-examples.md
+++ b/docs/src/guide/client/usage-examples.md
@@ -1,6 +1,6 @@
 # @mcp-ui/client Usage & Examples
 
-Here's how to use the `<ResourceRenderer />` component from `@mcp-ui/client`.
+Here's how to use the `<UIResourceRenderer />` component from `@mcp-ui/client`.
 
 ## Installation
 
@@ -14,17 +14,17 @@ npm i @mcp-ui/client
 
 ```tsx
 import React, { useState } from 'react';
-import { ResourceRenderer, UiActionResult } from '@mcp-ui/client';
+import { UIResourceRenderer, UIActionResult } from '@mcp-ui/client';
 
-// Simulate fetching an MCP resource block
-const fetchMcpResource = async (id: string): Promise<HtmlResource> => {
-  if (id === 'direct') {
+// Simulate fetching an MCP UI resource
+const fetchMcpResource = async (id: string): Promise<UIResource> => {
+  if (id === 'raw') {
     return {
       type: 'resource',
       resource: {
-        uri: 'ui://example/direct-html',
+        uri: 'ui://example/raw-html',
         mimeType: 'text/html',
-        text: "<h1>Direct HTML via Text</h1><p>Content loaded directly.</p><button onclick=\"window.parent.postMessage({ type: 'tool', payload: { toolName: 'uiInteraction', params: { action: 'directClick', value: Date.now() } } }, '*')\">Click Me (Direct)</button>",
+        text: "<h1>raw HTML via Text</h1><p>Content loaded rawly.</p><button onclick=\"window.parent.postMessage({ type: 'tool', payload: { toolName: 'uiInteraction', params: { action: 'rawClick', value: Date.now() } } }, '*')\">Click Me (raw)</button>",
       },
     };
   } else if (id === 'blob') {
@@ -52,7 +52,7 @@ const fetchMcpResource = async (id: string): Promise<HtmlResource> => {
 };
 
 const App: React.FC = () => {
-  const [resourceBlock, setResourceBlock] = useState<HtmlResource | null>(
+  const [uiResource, setUIResource] = useState<UIResource | null>(
     null,
   );
   const [loading, setLoading] = useState(false);
@@ -62,17 +62,17 @@ const App: React.FC = () => {
   const loadResource = async (id: string) => {
     setLoading(true);
     setError(null);
-    setResourceBlock(null);
+    setUIResource(null);
     try {
       const block = await fetchMcpResource(id);
-      setResourceBlock(block);
+      setUIResource(block);
     } catch (e: any) {
       setError(e.message);
     }
     setLoading(false);
   };
 
-  const handleGenericMcpAction = async (result: UiActionResult) => {
+  const handleGenericMcpAction = async (result: UIActionResult) => {
     if (result.type === 'tool') {
       console.log(`Action received in host app - Tool: ${result.payload.toolName}, Params:`, result.payload.params);
       setLastAction({ tool: result.payload.toolName, params: result.payload.params });
@@ -97,11 +97,11 @@ const App: React.FC = () => {
   return (
     <div>
       <h1>MCP-UI Client Demo</h1>
-      <button onClick={() => loadResource('direct')}>
-        Load Direct HTML (Text)
+      <button onClick={() => loadResource('raw')}>
+        Load raw HTML (Text)
       </button>
       <button onClick={() => loadResource('blob')}>
-        Load Direct HTML (Blob)
+        Load raw HTML (Blob)
       </button>
       <button onClick={() => loadResource('external')}>
         Load External App (URL)
@@ -110,12 +110,12 @@ const App: React.FC = () => {
       {loading && <p>Loading resource...</p>}
       {error && <p style={{ color: 'red' }}>Error: {error}</p>}
 
-      {resourceBlock && resourceBlock.resource && (
+      {uiResource && uiResource.resource && (
         <div style={{ marginTop: 20, border: '2px solid blue', padding: 10 }}>
-          <h2>Rendering Resource: {resourceBlock.resource.uri}</h2>
-          <ResourceRenderer
-            resource={resourceBlock.resource}
-            onUiAction={handleGenericMcpAction}
+          <h2>Rendering Resource: {uiResource.resource.uri}</h2>
+          <UIResourceRenderer
+            resource={uiResource.resource}
+            onUIAction={handleGenericMcpAction}
           />
         </div>
       )}
@@ -135,4 +135,4 @@ export default App;
 
 ---
 
-That's it! Just use `<ResourceRenderer />` with the right props and you're ready to render interactive HTML from MCP resources in your React app. The `ResourceRenderer` automatically detects the resource type and renders the appropriate component internally. If you need more details, check out the [ResourceRenderer Component](./resource-renderer.md) page.
+That's it! Just use `<UIResourceRenderer />` with the right props and you're ready to render interactive HTML from MCP resources in your React app. The `UIResourceRenderer` automatically detects the resource type and renders the appropriate component internally. If you need more details, check out the [UIResourceRenderer Component](./resource-renderer.md) page.
diff --git a/docs/src/guide/getting-started.md b/docs/src/guide/getting-started.md
index 1182bb3a..0ed11486 100644
--- a/docs/src/guide/getting-started.md
+++ b/docs/src/guide/getting-started.md
@@ -55,11 +55,11 @@ Once built, you can typically import from the packages as you would with any oth
 
 ```typescript
 // main.ts (your server-side application)
-import { createHtmlResource } from '@mcp-ui/server';
+import { createUIResource } from '@mcp-ui/server';
 
 const myHtmlPayload = `<h1>Hello from Server!</h1><p>Timestamp: ${new Date().toISOString()}</p>`;
 
-const resourceBlock = createHtmlResource({
+const resourceBlock = createUIResource({
   uri: 'ui://server-generated/item1',
   content: { type: 'rawHtml', htmlString: myHtmlPayload },
   delivery: 'text',
@@ -74,11 +74,11 @@ const resourceBlock = createHtmlResource({
 ```tsx
 // App.tsx (your React application)
 import React, { useState, useEffect } from 'react';
-import { ResourceRenderer, UiActionResult } from '@mcp-ui/client';
+import { UIResourceRenderer, UIActionResult } from '@mcp-ui/client';
 
 // Dummy MCP response structure
 interface McpToolResponse {
-  content: HtmlResource[];
+  content: any[];
 }
 
 function App() {
@@ -101,7 +101,7 @@ function App() {
     setMcpData(fakeMcpResponse);
   }, []);
 
-  const handleResourceAction = async (result: UiActionResult) => {
+  const handleResourceAction = async (result: UIActionResult) => {
     if (result.type === 'tool') {
       console.log(`Action from resource (tool: ${result.payload.toolName}):`, result.payload.params);
     } else if (result.type === 'prompt') {
@@ -135,9 +135,9 @@ function App() {
               }}
             >
               <h3>Resource: {item.resource.uri}</h3>
-              <ResourceRenderer
+              <UIResourceRenderer
                 resource={item.resource}
-                onUiAction={handleResourceAction}
+                onUIAction={handleResourceAction}
               />
             </div>
           );
@@ -182,13 +182,13 @@ npm i @mcp-ui/client
 ## Key Components
 
 ### Server Side (`@mcp-ui/server`)
-- **`createHtmlResource`**: Creates HTML resource objects for MCP responses
-- Handles HTML content, external URLs, and encoding options
+- **`createUIResource`**: Creates UI resource objects for MCP tool responses
+- Handles HTML content, external URLs, Remote DOM JS, and encoding options
 
 ### Client Side (`@mcp-ui/client`)
-- **`<ResourceRenderer />`**: Main component for rendering all types of MCP-UI resources
-- **`<HtmlResource />`**: Internal component for HTML resources
-- **`<RemoteDomResource />`**: Internal component for Remote DOM resources
+- **`<UIResourceRenderer />`**: Main component for rendering all types of MCP-UI resources
+- **`<HTMLResourceRenderer />`**: Internal component for HTML resources
+- **`<RemoteDOMResourceRenderer />`**: Internal component for Remote DOM resources
 
 ## Resource Types
 
@@ -198,11 +198,11 @@ MCP-UI supports several resource types:
 2. **External URLs** (`text/uri-list`): External applications and websites  
 3. **Remote DOM Resources** (`application/vnd.mcp-ui.remote-dom+javascript`): Javascript-defined UI that use host-native components
 
-All resource types are handled automatically by `<ResourceRenderer />`.
+All resource types are handled automatically by `<UIResourceRenderer />`.
 
 ## Next Steps
 
 - [Server SDK Usage & Examples](./server/usage-examples.md) - Learn how to create resources
 - [Client SDK Usage & Examples](./client/usage-examples.md) - Learn how to render resources
 - [Protocol Details](./protocol-details.md) - Understand the underlying protocol
-- [ResourceRenderer Component](./client/resource-renderer.md) - Comprehensive component guide
+- [UIResourceRenderer Component](./client/resource-renderer.md) - Comprehensive component guide
diff --git a/docs/src/guide/introduction.md b/docs/src/guide/introduction.md
index bdf90c2a..5c2e61f0 100644
--- a/docs/src/guide/introduction.md
+++ b/docs/src/guide/introduction.md
@@ -8,23 +8,23 @@ This SDK provides tools for building Model Context Protocol (MCP) enabled applic
 
 MCP-UI is a TypeScript SDK containing:
 
-- **`@mcp-ui/client`**: UI components (like `<ResourceRenderer />`) for easy rendering of interactive HTML resources.
-- **`@mcp-ui/server`**: Helper functions (like `createHtmlResource`) for server-side logic to easily construct `HtmlResource` objects.
+- **`@mcp-ui/client`**: UI components (like `<UIResourceRenderer />`) for easy rendering of interactive UI.
+- **`@mcp-ui/server`**: Helper functions (like `createUIResource`) for server-side logic to easily construct `UIResource` objects.
 
-## Core Concept: The Interactive HTML Resource Protocol
+## Core Concept: The Interactive UI Resource Protocol
 
-The central piece of this SDK is the `HtmlResource`. This object defines a contract for how interactive HTML content should be structured and delivered from a server/tool to a client.
+The central piece of this SDK is the `UIResource`. This object defines a contract for how interactive UI should be structured and delivered from a server/tool to a client.
 
-### `HtmlResource` Structure
+### `UIResource` Structure
 
 ```typescript
-export interface HtmlResource {
-  type: 'resource'; // Fixed type identifier
+interface UIResource {
+  type: 'resource';
   resource: {
-    uri: string; // Unique identifier. Governs rendering behavior.
-    mimeType: 'text/html' | 'text/uri-list'; // text/html for HTML content, text/uri-list for URL content
-    text?: string; // Raw HTML string or an iframe URL string.
-    blob?: string; // Base64 encoded HTML string or iframe URL string.
+    uri: string;       // ui://component/id
+    mimeType: 'text/html' | 'text/uri-list' | 'application/vnd.mcp-ui.remote-dom'; // text/html for HTML content, text/uri-list for URL content, application/vnd.mcp-ui.remote-dom for remote-dom content (Javascript)
+    text?: string;      // Inline HTML or external URL
+    blob?: string;      // Base64-encoded HTML or URL
   };
 }
 ```
@@ -41,16 +41,16 @@ export interface HtmlResource {
 
 ## How It Works
 
-1. **Server Side**: Use `@mcp-ui/server` to create `HtmlResource` objects
+1. **Server Side**: Use `@mcp-ui/server` to create `HTMLResourceRenderer` objects
 2. **Client Side**: Use `@mcp-ui/client` to render these resources in your React app
 
 ### Example Flow
 
 **Server (MCP Tool):**
 ```typescript
-import { createHtmlResource } from '@mcp-ui/server';
+import { createUIResource } from '@mcp-ui/server';
 
-const resource = createHtmlResource({
+const resource = createUIResource({
   uri: 'ui://my-tool/dashboard',
   content: { type: 'rawHtml', htmlString: '<h1>Dashboard</h1>' },
   delivery: 'text'
@@ -62,16 +62,16 @@ return { content: [resource] };
 
 **Client (React App):**
 ```tsx
-import { ResourceRenderer } from '@mcp-ui/client';
+import { UIResourceRenderer } from '@mcp-ui/client';
 
 function App({ mcpResponse }) {
   return (
     <div>
       {mcpResponse.content.map((item) => (
-        <ResourceRenderer
+        <UIResourceRenderer
           key={item.resource.uri}
           resource={item.resource}
-          onUiAction={(result) => {
+          onUIAction={(result) => {
             console.log('Action:', result);
             return { status: 'handled' };
           }}
@@ -99,6 +99,5 @@ function App({ mcpResponse }) {
 
 ## Philosophy
 
-Returning snippets of UI as responses from MCP servers is a powerful way to create interactive experiences. However, it can be difficult to get right.
-This is an ongoing discussion in the MCP community and the [UI Community Working Group](https://github.com/modelcontextprotocol-community/working-groups/issues/35).
-This project is an experimental playground for MCP-UI ideas, as explore ways to make it easier.
\ No newline at end of file
+Allowing MCP servers to respond with UI snippets is a powerful way to create interactive experiences in hosts. Nailing down the best way to do it is challenging, and is an ongoing discussion in the MCP community and the [UI Community Working Group](https://github.com/modelcontextprotocol-community/working-groups/issues/35).
+This project is an experimental playground for MCP-UI ideas, that aims to test out philosophies in the wild.
\ No newline at end of file
diff --git a/docs/src/guide/protocol-details.md b/docs/src/guide/protocol-details.md
index d97bbee4..7801935c 100644
--- a/docs/src/guide/protocol-details.md
+++ b/docs/src/guide/protocol-details.md
@@ -1,15 +1,15 @@
 # Protocol Details
 
-This section dives deeper into the `HtmlResourceBlock` and its intended usage.
+This section dives deeper into the `UIResource` and its intended usage.
 
-## `HtmlResourceBlock` Recap
+## `UIResource` Recap
 
 ```typescript
-export interface HtmlResourceBlock {
+export interface UIResource {
   type: 'resource';
   resource: {
     uri: string;
-    mimeType: 'text/html' | 'text/uri-list';
+    mimeType: 'text/html' | 'text/uri-list' | 'application/vnd.mcp-ui.remote-dom';
     text?: string;
     blob?: string;
   };
@@ -70,7 +70,7 @@ if (
   mcpResource.type === 'resource' &&
   mcpResource.resource.uri?.startsWith('ui://')
 ) {
-  return <ResourceRenderer resource={mcpResource.resource} onUiAction={handleAction} />;
+  return <UIResourceRenderer resource={mcpResource.resource} onUIAction={handleAction} />;
 }
 
 // ❌ Not recommended: Check mimeType first
@@ -78,14 +78,14 @@ if (
   mcpResource.type === 'resource' &&
   (mcpResource.resource.mimeType === 'text/html' || mcpResource.resource.mimeType === 'text/uri-list')
 ) {
-  return <ResourceRenderer resource={mcpResource.resource} onUiAction={handleAction} />;
+  return <UIResourceRenderer resource={mcpResource.resource} onUIAction={handleAction} />;
 }
 ```
 
 **Benefits of URI-first checking:**
 - Future-proof: Works with new content types like `application/javascript`
 - Semantic clarity: `ui://` clearly indicates this is a UI resource
-- Simpler logic: Let the `ResourceRenderer` component handle mimeType-based rendering internally
+- Simpler logic: Let the `UIResourceRenderer` component handle mimeType-based rendering internally
 
 ## Communication (Client <-> Iframe)
 
@@ -114,7 +114,7 @@ For `ui://` resources, you can use `window.parent.postMessage` to send data or a
 window.addEventListener('message', (event) => {
   // Add origin check for security: if (event.origin !== "expectedOrigin") return;
   if (event.data && event.data.tool) {
-    // Call the onUiAction prop of ResourceRenderer
+    // Call the onUIAction prop of UIResourceRenderer
   }
 });
 ```
diff --git a/docs/src/guide/server/overview.md b/docs/src/guide/server/overview.md
index 26eff76c..8bf77e24 100644
--- a/docs/src/guide/server/overview.md
+++ b/docs/src/guide/server/overview.md
@@ -1,15 +1,15 @@
 # @mcp-ui/server Overview
 
-The `@mcp-ui/server` package provides server-side utilities to help construct `HtmlResource` objects, which can then be sent to a client as part of an MCP response.
+The `@mcp-ui/server` package provides server-side utilities to help construct `UIResource` objects, which can then be sent to a client as part of an MCP response.
 
 ## Key Exports
 
-- **`createHtmlResource(options: CreateHtmlResourceOptions): HtmlResource`**:
-  The primary function for creating resource blocks. It takes an options object to define the URI, content (direct HTML or external URL), and delivery method (text or blob).
+- **`createUIResource(options: CreateUIResourceOptions): UIResource`**:
+  The primary function for creating UI snippets. It takes an options object to define the URI, content (direct HTML or external URL), and delivery method (text or blob).
 
 ## Purpose
 
-- **Ease of Use**: Simplifies the creation of valid `HtmlResource` objects.
+- **Ease of Use**: Simplifies the creation of valid `UIResource` objects.
 - **Validation**: Includes basic validation (e.g., URI prefixes matching content type).
 - **Encoding**: Handles Base64 encoding when `delivery: 'blob'` is specified.
 
diff --git a/docs/src/guide/server/usage-examples.md b/docs/src/guide/server/usage-examples.md
index 9ccb05fb..1387c2e8 100644
--- a/docs/src/guide/server/usage-examples.md
+++ b/docs/src/guide/server/usage-examples.md
@@ -12,18 +12,18 @@ npm i @mcp-ui/server
 
 ## Basic Usage
 
-The core function is `createHtmlResource`.
+The core function is `createUIResource`.
 
 ```typescript
 import {
-  createHtmlResource,
+  createUIResource,
 } from '@mcp-ui/server';
 
 // Using a shared enum value (just for demonstration)
 console.log('Shared Enum from server usage:', PlaceholderEnum.FOO);
 
 // Example 1: Direct HTML, delivered as text
-const resource1 = createHtmlResource({
+const resource1 = createUIResource({
   uri: 'ui://my-component/instance-1',
   content: { type: 'rawHtml', htmlString: '<p>Hello World</p>' },
   delivery: 'text',
@@ -41,7 +41,7 @@ console.log('Resource 1:', JSON.stringify(resource1, null, 2));
 */
 
 // Example 2: Direct HTML, delivered as a Base64 blob
-const resource2 = createHtmlResource({
+const resource2 = createUIResource({
   uri: 'ui://my-component/instance-2',
   content: { type: 'rawHtml', htmlString: '<h1>Complex HTML</h1>' },
   delivery: 'blob',
@@ -63,7 +63,7 @@ console.log(
 
 // Example 3: External URL, text delivery
 const dashboardUrl = 'https://my.analytics.com/dashboard/123';
-const resource3 = createHtmlResource({
+const resource3 = createUIResource({
   uri: 'ui://analytics-dashboard/main',
   content: { type: 'externalUrl', iframeUrl: dashboardUrl },
   delivery: 'text',
@@ -82,7 +82,7 @@ console.log('Resource 3:', JSON.stringify(resource3, null, 2));
 
 // Example 4: External URL, blob delivery (URL is Base64 encoded)
 const chartApiUrl = 'https://charts.example.com/api?type=pie&data=1,2,3';
-const resource4 = createHtmlResource({
+const resource4 = createUIResource({
   uri: 'ui://live-chart/session-xyz',
   content: { type: 'externalUrl', iframeUrl: chartApiUrl },
   delivery: 'blob',
@@ -120,7 +120,7 @@ https://backup.dashboard.example.com/main
 # Emergency fallback (will be logged but not used)  
 https://emergency.dashboard.example.com/main`;
 
-const resource5 = createHtmlResource({
+const resource5 = createUIResource({
   uri: 'ui://dashboard-with-fallbacks/session-123',
   content: { type: 'externalUrl', iframeUrl: multiUrlContent },
   delivery: 'text',
@@ -135,14 +135,14 @@ const resource5 = createHtmlResource({
 
 ## Error Handling
 
-The `createHtmlResource` function will throw errors if invalid combinations are provided, for example:
+The `createUIResource` function will throw errors if invalid combinations are provided, for example:
 
 - URI not starting with `ui://` for any content type
 - Invalid content type specified
 
 ```typescript
 try {
-  createHtmlResource({
+  createUIResource({
     uri: 'invalid://should-be-ui',
     content: { type: 'externalUrl', iframeUrl: 'https://example.com' },
     delivery: 'text',
diff --git a/docs/src/guide/shared/overview.md b/docs/src/guide/shared/overview.md
deleted file mode 100644
index f6796c48..00000000
--- a/docs/src/guide/shared/overview.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# @mcp-ui/shared Overview\n\nThe `@mcp-ui/shared` package is the foundation of the MCP-UI SDK, providing common types, enums, and utility functions used by both the server and client packages.\n\n## Key Exports\n\n- **`HtmlResourceBlock` (Interface)**: The core data structure for defining interactive HTML resources. (See [Protocol Details](../protocol-details.md) for more information).\n- **`ResourceContentPayload` (Type)**: Defines the structure for `content` within `CreateHtmlResourceOptions`, discriminating between direct HTML and external URLs.\n- **`CreateHtmlResourceOptions` (Interface)**: Options for the `createHtmlResource` function in `@mcp-ui/server`.\n- **`PlaceholderEnum` (Enum)**: An example enum: `export enum PlaceholderEnum { FOO = \'FOO\', BAR = \'BAR\' }`.\n- **`greet` (Function)**: An example utility function: `export const greet = (name: string): string => \`Hello, ${name}!\`;`\n\n## Purpose\n\n- **Consistency**: Ensures that client and server components operate on the same data structures.\n- **Reusability**: Offers common utilities that can be used across different parts of an MCP application.\n- **Type Safety**: Provides TypeScript definitions for better development experience.\n\n## Building\n\nThis package is built using Vite in library mode. It outputs ESM (`.mjs`) and UMD (`.js`) formats, along with TypeScript declaration files (`.d.ts`).\n\nTo build specifically this package from the monorepo root:\n```bash
-
-pnpm build --filter @mcp-ui/shared
-
-```
-
-```
diff --git a/docs/src/index.md b/docs/src/index.md
index 1fce8aec..b3c7cb6b 100644
--- a/docs/src/index.md
+++ b/docs/src/index.md
@@ -4,7 +4,7 @@ layout: home
 hero:
   name: MCP-UI
   text: Interactive UI Components for MCP
-  tagline: Build rich, dynamic user interfaces for your MCP applications with TypeScript SDKs that bring UI snippets to AI interactions.
+  tagline: Build rich, dynamic user interfaces for your MCP applications with TypeScript SDKs that bring UI to AI interactions.
   image:
     light: /logo-lg-black.png
     dark: /logo-lg.png
@@ -22,9 +22,9 @@ hero:
 
 features:
   - title: ⚛️ Client SDK
-    details: React components and hooks for seamless frontend integration. Render interactive UI resources with the ResourceRenderer component and handle UI actions effortlessly.
+    details: React components and hooks for seamless frontend integration. Render interactive UI resources with the UIResourceRenderer component and handle UI actions effortlessly.
   - title: 🛠️ Server SDK
-    details: Powerful utilities to construct interactive resource blocks for MCP servers. Create HTML, React, Web Components, and external app UI with ergonomic API.
+    details: Powerful utilities to construct interactive UI for MCP servers. Create HTML, React, Web Components, and external app UI with ergonomic API.
   - title: 🔒 Secure
     details: All remote code executes in sandboxed iframes, ensuring host and user security while maintaining rich interactivity.
   - title: 🎨 Flexible
@@ -48,9 +48,9 @@ features:
 **Server Side** - Create interactive resources to return in your MCP tool results:
 
 ```typescript
-import { createHtmlResource } from '@mcp-ui/server';
+import { createUIResource } from '@mcp-ui/server';
 
-const interactiveForm = createHtmlResource({
+const interactiveForm = createUIResource({
   uri: 'ui://user-form/1',
   content: { 
     type: 'externalUrl', 
@@ -63,13 +63,13 @@ const interactiveForm = createHtmlResource({
 **Client Side** - Render with one component:
 
 ```tsx
-import { ResourceRenderer } from '@mcp-ui/client';
+import { UIResourceRenderer } from '@mcp-ui/client';
 
 function MyApp({ mcpResource }) {
   return (
-    <ResourceRenderer
+    <UIResourceRenderer
       resource={mcpResource.resource}
-      onUiAction={(action) => {
+      onUIAction={(action) => {
         console.log('User action:', action);
         return { status: 'ok' };
       }}
diff --git a/examples/remote-dom-demo/README.md b/examples/remote-dom-demo/README.md
index 42559f7b..b47c35f6 100644
--- a/examples/remote-dom-demo/README.md
+++ b/examples/remote-dom-demo/README.md
@@ -9,9 +9,9 @@ https://github.com/user-attachments/assets/cace78be-7ac5-47bc-bb41-d722e3e28304
 
 The demo is split into two main concepts:
 
-1.  **UI Script (The "Server" or "Remote" side):** This is a piece of JavaScript that declaratively defines the UI structure and behavior using a set of standard elements (e.g., `<ui-text>`, `<ui-button>`). In a real-world scenario, this script would be generated and served by an MCP server inside an EmbeddedResource (through the `mcp-ui` server SDK). In this demo, you can directly edit this script in the text area at the bottom of the page.
+1.  **UI Script (The "Server"/"Remote" side):** This is a piece of JavaScript that declaratively defines the UI structure and behavior using a set of standard elements (e.g., `<ui-text>`, `<ui-button>`). In a real-world scenario, this script would be generated and served by an MCP server inside an EmbeddedResource (through the `mcp-ui` server SDK). In this demo, you can directly edit this script in the text area at the bottom of the page.
 
-2.  **Component Library (The "Host" or "Client" side):** This is a set of UI components (e.g., React components, Web Components) that know how to render the elements defined in the UI script. The host application receives the UI script and uses its component library to render the actual UI to the user. This demo showcases three different component libraries running in parallel.
+2.  **Component Library (The "Host"/"Client" side):** This is a set of UI components (e.g., React components, Web Components) that know how to render the elements defined in the UI script. The host application receives the UI script and uses its component library to render the actual UI to the user. This demo showcases three different component libraries running in parallel.
 
 ## How to Use the Demo
 
@@ -38,7 +38,7 @@ If you are building a host application that needs to render remote UI, you can u
     *   `radix.tsx`: A library that maps remote elements to styled React components from Radix UI.
     *   `webcomponents.ts`: A library that defines and registers standard custom elements.
 2.  **Create your library:** Create a new file in `src/libraries` for your own component library. You will need to provide mappings from the remote element definitions (e.g., `remoteButtonDefinition`) to your actual components.
-3.  **Integrate your library:** In `src/App.tsx`, import your new library and add a new `<RemoteDomResource>` instance inside the grid. Pass your component library to the `library` prop.
+3.  **Integrate your library:** In `src/App.tsx`, import your new library and add a new `<RemoteDOMResourceRenderer>` instance inside the grid. Pass your component library to the `library` prop.
 4.  **Test:** Run the demo and use the script editor to test how your component library handles various UI scenarios.
 
 ## Running the Demo Locally
diff --git a/examples/remote-dom-demo/src/App.tsx b/examples/remote-dom-demo/src/App.tsx
index 3825860f..a0ec05e1 100644
--- a/examples/remote-dom-demo/src/App.tsx
+++ b/examples/remote-dom-demo/src/App.tsx
@@ -1,5 +1,5 @@
 import {
-  ResourceRenderer,
+  UIResourceRenderer,
   basicComponentLibrary,
   remoteTextDefinition,
   remoteButtonDefinition,
@@ -18,7 +18,7 @@ const remoteElements = [
   remoteImageDefinition,
 ];
 
-const defaultRemoteDomScript = `let isDarkMode = false;
+const defaultRemoteDOMScript = `let isDarkMode = false;
 
 // Create the main container stack with centered alignment
 const stack = document.createElement('ui-stack');
@@ -74,8 +74,8 @@ root.appendChild(stack);
 `;
 
 function App() {
-  const [scriptContent, setScriptContent] = useState(defaultRemoteDomScript);
-  const [inputValue, setInputValue] = useState(defaultRemoteDomScript);
+  const [scriptContent, setScriptContent] = useState(defaultRemoteDOMScript);
+  const [inputValue, setInputValue] = useState(defaultRemoteDOMScript);
   const [isPending, startTransition] = useTransition();
 
   useEffect(() => {
@@ -143,7 +143,7 @@ function App() {
         >
           <h2 style={{ textAlign: 'center' }}>Basic React Components</h2>
 
-          <ResourceRenderer
+          <UIResourceRenderer
             key={`basic-${scriptContent}`}
             resource={mockResourceReact}
             library={basicComponentLibrary}
@@ -160,7 +160,7 @@ function App() {
         >
           <h2 style={{ textAlign: 'center' }}>Radix React Components</h2>
 
-          <ResourceRenderer
+          <UIResourceRenderer
             key={`radix-${scriptContent}`}
             resource={mockResourceReact}
             library={radixComponentLibrary}
@@ -177,7 +177,7 @@ function App() {
         >
           <h2 style={{ textAlign: 'center' }}>Web Components</h2>
 
-          <ResourceRenderer
+          <UIResourceRenderer
             key={`webcomponents-${scriptContent}`}
             resource={mockResourceWebComponents}
             library={basicComponentLibrary}
diff --git a/examples/remote-dom-demo/src/libraries/webcomponents.ts b/examples/remote-dom-demo/src/libraries/webcomponents.ts
index d0d09934..ff33320e 100644
--- a/examples/remote-dom-demo/src/libraries/webcomponents.ts
+++ b/examples/remote-dom-demo/src/libraries/webcomponents.ts
@@ -1,4 +1,4 @@
-class UiButton extends HTMLElement {
+class UIButton extends HTMLElement {
   static get observedAttributes() {
     return ['label'];
   }
@@ -25,7 +25,7 @@ class UiButton extends HTMLElement {
   }
 }
 
-class UiText extends HTMLElement {
+class UIText extends HTMLElement {
   static get observedAttributes() {
     return ['content'];
   }
@@ -48,7 +48,7 @@ class UiText extends HTMLElement {
   }
 }
 
-class UiStack extends HTMLElement {
+class UIStack extends HTMLElement {
   static get observedAttributes() {
     return ['direction', 'spacing', 'align', 'justify'];
   }
@@ -91,7 +91,7 @@ class UiStack extends HTMLElement {
   }
 }
 
-class UiImage extends HTMLElement {
+class UIImage extends HTMLElement {
   static get observedAttributes() {
     return ['src', 'alt', 'width', 'height'];
   }
@@ -144,15 +144,15 @@ class UiImage extends HTMLElement {
 
 export function defineWebComponents() {
   if (!customElements.get('ui-button')) {
-    customElements.define('ui-button', UiButton);
+    customElements.define('ui-button', UIButton);
   }
   if (!customElements.get('ui-text')) {
-    customElements.define('ui-text', UiText);
+    customElements.define('ui-text', UIText);
   }
   if (!customElements.get('ui-stack')) {
-    customElements.define('ui-stack', UiStack);
+    customElements.define('ui-stack', UIStack);
   }
   if (!customElements.get('ui-image')) {
-    customElements.define('ui-image', UiImage);
+    customElements.define('ui-image', UIImage);
   }
 }
diff --git a/examples/server/README.md b/examples/server/README.md
index c8d4013c..ee28a310 100644
--- a/examples/server/README.md
+++ b/examples/server/README.md
@@ -1,179 +1,3 @@
-## 📦 Model Context Protocol UI SDK
+This example features a complete MCP remote server hosted on Cloudflare.
 
-<p align="center">
-  <a href="https://www.npmjs.com/package/@mcp-ui/server"><img src="https://img.shields.io/npm/v/@mcp-ui/server?label=server&color=green" alt="Server Version"></a>
-  <a href="https://www.npmjs.com/package/@mcp-ui/client"><img src="https://img.shields.io/npm/v/@mcp-ui/client?label=client&color=blue" alt="Client Version"></a>
-</p>
-
-<p align="center">
-  <a href="#-what-is-mcp-ui">What's mcp-ui?</a> •
-  <a href="#-installation">Installation</a> •
-  <a href="#-quickstart">Quickstart</a> •
-  <a href="#-examples">Examples</a> •
-  <a href="#-roadmap">Roadmap</a> •
-  <a href="#-contributing">Contributing</a> •
-  <a href="#-license">License</a>
-</p>
-
-----
-
-**`mcp-ui`** brings interactive web components to the [Model Context Protocol](https://modelcontextprotocol.io/introduction) (MCP). Deliver rich, dynamic UI resources directly from your MCP server to be rendered by the client. Take AI interaction to the next level!
-
-> *This project is an experimental community playground for MCP UI ideas. Expect rapid iteration and enhancements!*
-
-<video src="https://github.com/user-attachments/assets/51f7c712-8133-4d7c-86d3-fdca550b9767"></video>
-
-## 💡 What's `mcp-ui`?
-
-`mcp-ui` is a TypeScript SDK comprising two packages:
-
-* **`@mcp-ui/server`**: Utilities to generate UI resource objects (`HtmlResourceBlock`) on your MCP server.
-* **`@mcp-ui/client`**: UI components (e.g., `<ResourceRenderer />`) to render those blocks in the browser and handle their events.
-
-Together, they let you define reusable UI resource blocks on the server side, seamlessly display them in the client, and react to their actions in the MCP host environment.
-
-**North star** -
-* Enable servers to deliver rich, interactive UIs with ergonomic APIs
-* Allow any host to support UI with its own look-and-feel
-* Eliminate security concerns (limit/remove local code execution)
-
-
-## ✨ Core Concepts
-
-The primary component for rendering MCP resources is `<ResourceRenderer />`. It automatically detects the resource type and renders the appropriate component.
-
-### Supported Resource Types
-
-#### HTML (`text/html` and `text/uri-list`)
-
-Rendered using the `<HtmlResource />` component, which displays content inside an `<iframe>`. This is suitable for self-contained HTML or embedding external sites.
-
-*   **`mimeType`**:
-    *   `text/html`: Renders inline HTML content.
-    *   `text/uri-list`: Renders an external URL. MCP-UI uses the first valid URL.
-*   **Props**:
-    *   **`resource`**: The `resource` object from an MCP message.
-    *   **`onUiAction`**: A callback function to handle events.
-    *   **`supportedContentTypes`**: (Optional) Array to filter content types (`'rawHtml'`, `'externalUrl'`).
-    *   **`style`**: (Optional) Custom styles for the iframe.
-    *   **`iframeProps`**: (Optional) Custom iframe props.
-
-#### Remote DOM (`application/vnd.mcp-ui.remote-dom`)
-
-Rendered using the `<RemoteDomResource />` component, which uses Shopify's [`remote-dom`](https://github.com/Shopify/remote-dom). The server responds with a script that describes the UI and events. On the host, the script is securely rendered in a sandboxed iframe, and the UI changes are communicated to the host in JSON, where they're rendered using the host's component library. This is more flexible than iframes and allows for UIs that match the host's look-and-feel.
-
-* **`mimeType`**: `application/vnd.mcp-ui.remote-dom; flavor={react | webcomponents}`
-* **Props**:
-    * **`resource`**: The `resource` object from an MCP message.
-    * **`library`**: A component library that maps remote element names (e.g., "button") to actual React or web components. `mcp-ui` provides a `basicComponentLibrary` for common HTML elements, and you can provide your own for custom components.
-    * **`onUiAction`**: A callback function to handle events.
-
-### UI Action
-
-UI blocks must be able to interact with the agent. In `mcp-ui`, this is done by hooking into events sent from the UI block and reacting to them in the host. For example, an HTML may trigger a tool call when a button is clicked by sending an event which will be caught handled by the client.
-
-## 🏗️ Installation
-
-```bash
-# using npm
-npm install @mcp-ui/server @mcp-ui/client
-
-# or pnpm
-pnpm add @mcp-ui/server @mcp-ui/client
-
-# or yarn
-yarn add @mcp-ui/server @mcp-ui/client
-```
-
-## 🎬 Quickstart
-
-1. **Server-side**: Build your resource blocks
-
-   ```ts
-   import { createHtmlResource } from '@mcp-ui/server';
-   import {
-    createRemoteComponent,
-    createRemoteDocument,
-    createRemoteText,
-   } from '@remote-dom/core';
-
-   // Inline HTML
-   const htmlResource = createHtmlResource({
-     uri: 'ui://greeting/1',
-     content: { type: 'rawHtml', htmlString: '<p>Hello, MCP UI!</p>' },
-     delivery: 'text',
-   });
-
-   // External URL
-   const externalUrlResource = createHtmlResource({
-     uri: 'ui://greeting/1',
-     content: { type: 'externalUrl', iframeUrl: 'https://example.com' },
-     delivery: 'text',
-   });
-   ```
-
-2. **Client-side**: Render in your MCP host
-
-   ```tsx
-   import React from 'react';
-   import { ResourceRenderer } from '@mcp-ui/client';
-
-   function App({ mcpResource }) {
-     if (
-       mcpResource.type === 'resource' &&
-       mcpResource.resource.uri?.startsWith('ui://')
-     ) {
-       return (
-         <ResourceRenderer
-           resource={mcpResource.resource}
-           onUiAction={(result) => {
-             console.log('Action:', result);
-             return { status: 'ok' };
-           }}
-         />
-       );
-     }
-     return <p>Unsupported resource</p>;
-   }
-   ```
-
-3. **Enjoy** interactive MCP UIs — no extra configuration required.
-
-## 🌍 Examples
-
-**Client example**
-* [ui-inspector](https://github.com/idosal/ui-inspector) - inspect local `mcp-ui`-enabled servers. 
-* [MCP-UI Chat](https://github.com/idosal/scira-mcp-ui-chat) - interactive chat built with the `mcp-ui` client. Check out the [hosted version](https://scira-mcp-chat-git-main-idosals-projects.vercel.app/)!
-* MCP-UI RemoteDOM Playground - local demo app to test RemoteDOM resources (intended for hosts)
-
-**Server example**
-Try out the hosted app -
-* **HTTP Streaming**: `https://remote-mcp-server-authless.idosalomon.workers.dev/mcp`
-* **SSE**: `https://remote-mcp-server-authless.idosalomon.workers.dev/sse`
-
-The app is deployed from `examples/server`.
-
-Drop those URLs into any MCP-compatible host to see `mcp-ui` in action.
-
-
-## 🛣️ Roadmap
-
-- [X] Add online playground
-- [X] Expand UI Action API (beyond tool calls)
-- [X] Support Web Components
-- [X] Support Remote-DOM
-- [ ] Add component libraries (in progress)
-- [ ] Support additional client-side libraries and render engines (e.g., Vue, TUI, etc.)
-
-## 🤝 Contributing
-
-Contributions, ideas, and bug reports are welcome! See the [contribution guidelines](https://github.com/idosal/mcp-ui/blob/main/.github/CONTRIBUTING.md) to get started.
-
-
-## 📄 License
-
-Apache License 2.0 © [The MCP UI Authors](LICENSE)
-
-## Disclaimer
-
-This project is provided "as is", without warranty of any kind. The `mcp-ui` authors and contributors shall not be held liable for any damages, losses, or issues arising from the use of this software. Use at your own risk.
+The server is the standard Cloudflare auth-less boilerplate. The only part relevant to `mcp-ui` is in the tool definitions (`src/index.ts`), where we return a UI resource created using `createUIResource` instead of a string.
\ No newline at end of file
diff --git a/examples/server/src/index.ts b/examples/server/src/index.ts
index c4171a7e..31152dcb 100644
--- a/examples/server/src/index.ts
+++ b/examples/server/src/index.ts
@@ -157,9 +157,9 @@ export class MyMCP extends McpAgent {
 
         // Generate a unique URI for this specific invocation of the file picker UI.
         // This URI identifies the resource block itself, not the content of the iframe.
-        const uniqueUiAppUri = `ui://task-manager/${Date.now()}`;
+        const uniqueUIAppUri = `ui://task-manager/${Date.now()}`;
         const resourceBlock = createHtmlResource({
-          uri: uniqueUiAppUri,
+          uri: uniqueUIAppUri,
           content: { type: 'externalUrl', iframeUrl: pickerPageUrl },
           delivery: 'text', // The URL itself is delivered as text
         });
@@ -183,9 +183,9 @@ export class MyMCP extends McpAgent {
 
         // Generate a unique URI for this specific invocation of the file picker UI.
         // This URI identifies the resource block itself, not the content of the iframe.
-        const uniqueUiAppUri = `ui://user-profile/${Date.now()}`;
+        const uniqueUIAppUri = `ui://user-profile/${Date.now()}`;
         const resourceBlock = createHtmlResource({
-          uri: uniqueUiAppUri,
+          uri: uniqueUIAppUri,
           content: { type: 'externalUrl', iframeUrl: pickerPageUrl },
           delivery: 'text', // The URL itself is delivered as text
         });
diff --git a/packages/client/README.md b/packages/client/README.md
index aefe8ce1..9f90042b 100644
--- a/packages/client/README.md
+++ b/packages/client/README.md
@@ -35,8 +35,8 @@
 
 `mcp-ui` is a TypeScript SDK comprising two packages:
 
-* **`@mcp-ui/server`**: Utilities to generate UI snippets (`HtmlResourceBlock`) on your MCP server.
-* **`@mcp-ui/client`**: UI components (e.g., `<ResourceRenderer />`) to render those snippets and handle their events.
+* **`@mcp-ui/server`**: Utilities to generate UI resources (`UIResource`) on your MCP server.
+* **`@mcp-ui/client`**: UI components (e.g., `<UIResourceRenderer />`) to render the UI resources and handle their events.
 
 Together, they let you define reusable UI snippets on the server side, seamlessly and securely render them in the client, and react to their actions in the MCP host environment.
 
@@ -44,11 +44,11 @@ Together, they let you define reusable UI snippets on the server side, seamlessl
 
 In essence, by using `mcp-ui` SDKs, servers and hosts can agree on contracts that enable them to create and render interactive UI snippets (as a path to a standardized UI approach in MCP).
 
-### HTML Resource Block
-The primary payload returned from the server to the client is the `HtmlResourceBlock`:
+### UI Resource
+The primary payload returned from the server to the client is the `UIResource`:
 
 ```ts
-interface HtmlResourceBlock {
+interface UIResource {
   type: 'resource';
   resource: {
     uri: string;       // ui://component/id
@@ -67,11 +67,11 @@ interface HtmlResourceBlock {
 
 ### Resource Renderer
 
-The HTML Resource Block is rendered in the `<ResourceRenderer />` component. It automatically detects the resource type and renders the appropriate component.
+The UI Resource is rendered in the `<UIResourceRenderer />` component. It automatically detects the resource type and renders the appropriate component.
 
 It accepts the following props:
 - **`resource`**: The resource object from an MCP response. Should include `uri`, `mimeType`, and content (`text`, `blob`, or `content`)
-- **`onUiAction`**: Optional callback for handling UI actions from the resource:
+- **`onUIAction`**: Optional callback for handling UI actions from the resource:
   ```typescript
   { type: 'tool', payload: { toolName: string, params: Record<string, unknown> } } |
   { type: 'intent', payload: { intent: string, params: Record<string, unknown> } } |
@@ -89,17 +89,17 @@ It accepts the following props:
 
 #### HTML (`text/html` and `text/uri-list`)
 
-Rendered using the `<HtmlResource />` component, which displays content inside an `<iframe>`. This is suitable for self-contained HTML or embedding external apps.
+Rendered using the `<HTMLResourceRenderer />` component, which displays content inside an `<iframe>`. This is suitable for self-contained HTML or embedding external apps.
 
-**`mimeType`**:
+*   **`mimeType`**:
     *   `text/html`: Renders inline HTML content.
     *   `text/uri-list`: Renders an external URL. MCP-UI uses the first valid URL.
 
 #### Remote DOM (`application/vnd.mcp-ui.remote-dom`)
 
-Rendered using the `<RemoteDomResource />` component, which uses Shopify's [`remote-dom`](https://github.com/Shopify/remote-dom). The server responds with a script that describes the UI and events. On the host, the script is securely rendered in a sandboxed iframe, and the UI changes are communicated to the host in JSON, where they're rendered using the host's component library. This is more flexible than iframes and allows for UIs that match the host's look-and-feel.
+Rendered using the `<RemoteDOMResourceRenderer />` component, which uses Shopify's [`remote-dom`](https://github.com/Shopify/remote-dom). The server responds with a script that describes the UI and events. On the host, the script is securely rendered in a sandboxed iframe, and the UI changes are communicated to the host in JSON, where they're rendered using the host's component library. This is more flexible than iframes and allows for UIs that match the host's look-and-feel.
 
-**`mimeType`**: `application/vnd.mcp-ui.remote-dom; flavor={react | webcomponents}`
+* **`mimeType`**: `application/vnd.mcp-ui.remote-dom; flavor={react | webcomponents}`
 
 ### UI Action
 
@@ -123,7 +123,7 @@ yarn add @mcp-ui/server @mcp-ui/client
 1. **Server-side**: Build your resource blocks
 
    ```ts
-   import { createHtmlResource } from '@mcp-ui/server';
+   import { createUIResource } from '@mcp-ui/server';
    import {
     createRemoteComponent,
     createRemoteDocument,
@@ -131,14 +131,14 @@ yarn add @mcp-ui/server @mcp-ui/client
    } from '@remote-dom/core';
 
    // Inline HTML
-   const htmlResource = createHtmlResource({
+   const htmlResource = createUIResource({
      uri: 'ui://greeting/1',
      content: { type: 'rawHtml', htmlString: '<p>Hello, MCP UI!</p>' },
      delivery: 'text',
    });
 
    // External URL
-   const externalUrlResource = createHtmlResource({
+   const externalUrlResource = createUIResource({
      uri: 'ui://greeting/1',
      content: { type: 'externalUrl', iframeUrl: 'https://example.com' },
      delivery: 'text',
@@ -149,7 +149,7 @@ yarn add @mcp-ui/server @mcp-ui/client
 
    ```tsx
    import React from 'react';
-   import { ResourceRenderer } from '@mcp-ui/client';
+   import { UIResourceRenderer } from '@mcp-ui/client';
 
    function App({ mcpResource }) {
      if (
@@ -157,9 +157,9 @@ yarn add @mcp-ui/server @mcp-ui/client
        mcpResource.resource.uri?.startsWith('ui://')
      ) {
        return (
-         <ResourceRenderer
+         <UIResourceRenderer
            resource={mcpResource.resource}
-           onUiAction={(result) => {
+           onUIAction={(result) => {
              console.log('Action:', result);
              return { status: 'ok' };
            }}
@@ -170,7 +170,7 @@ yarn add @mcp-ui/server @mcp-ui/client
    }
    ```
 
-3. **Enjoy** interactive MCP UI snippets — no extra configuration required.
+3. **Enjoy** interactive MCP UI — no extra configuration required.
 
 ## 🌍 Examples
 
@@ -199,6 +199,7 @@ Host and user security is one of `mcp-ui`'s primary concerns. In all content typ
 - [X] Support Web Components
 - [X] Support Remote-DOM
 - [ ] Add component libraries (in progress)
+- [ ] Support additional frontend frameworks
 - [ ] Add declarative UI content type
 - [ ] Support generative UI?
       
diff --git a/packages/client/src/components/HtmlResource.tsx b/packages/client/src/components/HTMLResourceRenderer.tsx
similarity index 82%
rename from packages/client/src/components/HtmlResource.tsx
rename to packages/client/src/components/HTMLResourceRenderer.tsx
index eb5fecf3..2d6b38de 100644
--- a/packages/client/src/components/HtmlResource.tsx
+++ b/packages/client/src/components/HTMLResourceRenderer.tsx
@@ -1,11 +1,11 @@
 import React, { useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import type { Resource } from '@modelcontextprotocol/sdk/types.js';
-import { UiActionResult } from '../types';
+import { UIActionResult } from '../types';
 import { processResource } from '../utils/processResource';
 
-export type RenderHtmlResourceProps = {
+export type HTMLResourceRendererProps = {
   resource: Partial<Resource>;
-  onUiAction?: (result: UiActionResult) => Promise<unknown>;
+  onUIAction?: (result: UIActionResult) => Promise<unknown>;
   style?: React.CSSProperties;
   iframeProps?: Omit<
     React.HTMLAttributes<HTMLIFrameElement>,
@@ -13,12 +13,12 @@ export type RenderHtmlResourceProps = {
   >;
 };
 
-export const HtmlResource = React.forwardRef<
+export const HTMLResourceRenderer = React.forwardRef<
   HTMLIFrameElement | null,
-  RenderHtmlResourceProps
+  HTMLResourceRendererProps
 >(
   (
-    { resource, onUiAction, style, iframeProps },
+    { resource, onUIAction, style, iframeProps },
     ref,
   ) => {
     const iframeRef = useRef<HTMLIFrameElement | null>(null);
@@ -36,13 +36,13 @@ export const HtmlResource = React.forwardRef<
           iframeRef.current &&
           event.source === iframeRef.current.contentWindow
         ) {
-          const uiActionResult = event.data as UiActionResult;
+          const uiActionResult = event.data as UIActionResult;
           if (!uiActionResult) {
             return;
           }
-          onUiAction?.(uiActionResult)?.catch((err) => {
+          onUIAction?.(uiActionResult)?.catch((err) => {
             console.error(
-              'Error handling UI action result in RenderHtmlResource:',
+              'Error handling UI action result in HTMLResourceRenderer:',
               err,
             );
           });
@@ -50,7 +50,7 @@ export const HtmlResource = React.forwardRef<
       }
       window.addEventListener('message', handleMessage);
       return () => window.removeEventListener('message', handleMessage);
-    }, [onUiAction]);
+    }, [onUIAction]);
 
     if (error) return <p className="text-red-500">{error}</p>;
 
@@ -100,4 +100,4 @@ export const HtmlResource = React.forwardRef<
   },
 );
 
-HtmlResource.displayName = 'HtmlResource';
+HTMLResourceRenderer.displayName = 'HTMLResourceRenderer';
diff --git a/packages/client/src/components/RemoteDomRenderer.tsx b/packages/client/src/components/RemoteDOMRenderer.tsx
similarity index 82%
rename from packages/client/src/components/RemoteDomRenderer.tsx
rename to packages/client/src/components/RemoteDOMRenderer.tsx
index 9172ab53..55f670a7 100644
--- a/packages/client/src/components/RemoteDomRenderer.tsx
+++ b/packages/client/src/components/RemoteDOMRenderer.tsx
@@ -1,11 +1,11 @@
 import React, { useEffect, useRef } from 'react';
 import { DOMRemoteReceiver } from '@remote-dom/core/receivers';
 
-export type RemoteDomRendererProps = {
+export type RemoteDOMRendererProps = {
   receiver: DOMRemoteReceiver;
 };
 
-export const RemoteDomRenderer: React.FC<RemoteDomRendererProps> = ({
+export const RemoteDOMRenderer: React.FC<RemoteDOMRendererProps> = ({
   receiver,
 }) => {
   const containerRef = useRef<HTMLDivElement>(null);
diff --git a/packages/client/src/components/RemoteDomResource.tsx b/packages/client/src/components/RemoteDOMResourceRenderer.tsx
similarity index 87%
rename from packages/client/src/components/RemoteDomResource.tsx
rename to packages/client/src/components/RemoteDOMResourceRenderer.tsx
index da985141..796abfe8 100644
--- a/packages/client/src/components/RemoteDomResource.tsx
+++ b/packages/client/src/components/RemoteDOMResourceRenderer.tsx
@@ -8,23 +8,23 @@ import {
 import type { Resource } from '@modelcontextprotocol/sdk/types.js';
 import { IFRAME_SRC_DOC } from '../remote-dom/iframe-bundle';
 import { ThreadIframe } from '@quilted/threads';
-import type { SandboxAPI, RemoteElementConfiguration, UiActionResult } from '../types';
+import type { SandboxAPI, RemoteElementConfiguration, UIActionResult } from '../types';
 import type { ComponentLibrary } from '../remote-dom/types/componentLibrary';
 import { basicComponentLibrary } from '../remote-dom/component-libraries/basic';
-import { RemoteDomRenderer } from './RemoteDomRenderer';
+import { RemoteDOMRenderer } from './RemoteDOMRenderer';
 
-export type RemoteDomResourceProps = {
+export type RemoteDOMResourceProps = {
   resource: Partial<Resource>;
   library?: ComponentLibrary;
   remoteElements?: RemoteElementConfiguration[];
-  onUiAction?: (result: UiActionResult) => Promise<unknown>;
+  onUIAction?: (result: UIActionResult) => Promise<unknown>;
 };
 
-export const RemoteDomResource: React.FC<RemoteDomResourceProps> = ({
+export const RemoteDOMResourceRenderer: React.FC<RemoteDOMResourceProps> = ({
   resource,
   library,
   remoteElements = [],
-  onUiAction,
+  onUIAction,
 }) => {
   const iframeRef = useRef<HTMLIFrameElement>(null);
   const threadRef = useRef<ThreadIframe<SandboxAPI> | null>(null);
@@ -80,13 +80,13 @@ export const RemoteDomResource: React.FC<RemoteDomResourceProps> = ({
         iframeRef.current &&
         event.source === iframeRef.current.contentWindow
       ) {
-        const uiActionResult = event.data as UiActionResult;
+        const uiActionResult = event.data as UIActionResult;
         if (!uiActionResult) {
           return;
         }
-        onUiAction?.(uiActionResult)?.catch((err) => {
+        onUIAction?.(uiActionResult)?.catch((err) => {
           console.error(
-            'Error handling UI action result in RemoteDomResource:',
+            'Error handling UI action result in RemoteDOMResourceRenderer:',
             err,
           );
         });
@@ -94,7 +94,7 @@ export const RemoteDomResource: React.FC<RemoteDomResourceProps> = ({
     }
     window.addEventListener('message', handleMessage);
     return () => window.removeEventListener('message', handleMessage);
-  }, [onUiAction]);
+  }, [onUIAction]);
 
   useEffect(() => {
     // This effect runs when the iframe is remounted due to a key change.
@@ -150,7 +150,7 @@ export const RemoteDomResource: React.FC<RemoteDomResourceProps> = ({
       {flavor === 'react' && components ? (
         <RemoteRootRenderer receiver={receiver as RemoteReceiver} components={components} />
       ) : (
-        <RemoteDomRenderer receiver={receiver as DOMRemoteReceiver} />
+        <RemoteDOMRenderer receiver={receiver as DOMRemoteReceiver} />
       )}
     </>
   );
diff --git a/packages/client/src/components/ResourceRenderer.tsx b/packages/client/src/components/UIResourceRenderer.tsx
similarity index 76%
rename from packages/client/src/components/ResourceRenderer.tsx
rename to packages/client/src/components/UIResourceRenderer.tsx
index b96b263d..41592bf3 100644
--- a/packages/client/src/components/ResourceRenderer.tsx
+++ b/packages/client/src/components/UIResourceRenderer.tsx
@@ -1,12 +1,12 @@
 import React from 'react';
 import type { Resource } from '@modelcontextprotocol/sdk/types.js';
 import { ResourceContentType } from '../types';
-import { HtmlResource, RenderHtmlResourceProps } from './HtmlResource';
-import { RemoteDomResource, RemoteDomResourceProps } from './RemoteDomResource';
+import { HTMLResourceRenderer, HTMLResourceRendererProps } from './HTMLResourceRenderer';
+import { RemoteDOMResourceProps, RemoteDOMResourceRenderer } from './RemoteDOMResourceRenderer';
 import { basicComponentLibrary } from '../remote-dom/component-libraries/basic';
 
-type ResourceRendererProps = Omit<
-  RenderHtmlResourceProps & RemoteDomResourceProps,
+type UIResourceRendererProps = Omit<
+  HTMLResourceRendererProps & RemoteDOMResourceProps,
   'resource'
 > & {
   resource: Partial<Resource>;
@@ -31,10 +31,10 @@ function getContentType(
   }
 }
 
-export const ResourceRenderer: React.FC<ResourceRendererProps> = (props) => {
+export const UIResourceRenderer: React.FC<UIResourceRendererProps> = (props) => {
   const {
     resource,
-    onUiAction,
+    onUIAction,
     style,
     iframeProps,
     supportedContentTypes,
@@ -57,18 +57,18 @@ export const ResourceRenderer: React.FC<ResourceRendererProps> = (props) => {
     case 'rawHtml':
     case 'externalUrl':
       return (
-        <HtmlResource
+        <HTMLResourceRenderer
           resource={resource}
-          onUiAction={onUiAction}
+          onUIAction={onUIAction}
           style={style}
           iframeProps={iframeProps}
         />
       );
     case 'remoteDom':
       return (
-        <RemoteDomResource
+        <RemoteDOMResourceRenderer
           resource={resource}
-          onUiAction={onUiAction}
+          onUIAction={onUIAction}
           library={library || basicComponentLibrary}
           remoteElements={remoteElements}
         />
diff --git a/packages/client/src/components/__tests__/HtmlResource.test.tsx b/packages/client/src/components/__tests__/HTMLResourceRenderer.test.tsx
similarity index 70%
rename from packages/client/src/components/__tests__/HtmlResource.test.tsx
rename to packages/client/src/components/__tests__/HTMLResourceRenderer.test.tsx
index 8462cba5..d51a9c4d 100644
--- a/packages/client/src/components/__tests__/HtmlResource.test.tsx
+++ b/packages/client/src/components/__tests__/HTMLResourceRenderer.test.tsx
@@ -1,16 +1,16 @@
 import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import { HtmlResource, RenderHtmlResourceProps } from '../HtmlResource.js';
+import { HTMLResourceRenderer, HTMLResourceRendererProps } from '../HTMLResourceRenderer';
 import { vi } from 'vitest';
 import type { Resource } from '@modelcontextprotocol/sdk/types.js';
-import { UiActionResult } from '../../types.js';
+import { UIActionResult } from '../../types.js';
 
-describe('HtmlResource component', () => {
-  const mockOnUiAction = vi.fn();
+describe('HTMLResource component', () => {
+  const mockOnUIAction = vi.fn();
 
-  const defaultProps: RenderHtmlResourceProps = {
+  const defaultProps: HTMLResourceRendererProps = {
     resource: { mimeType: 'text/html', text: '<p>Hello Test</p>' },
-    onUiAction: mockOnUiAction,
+    onUIAction: mockOnUIAction,
   };
 
   
@@ -19,7 +19,7 @@ describe('HtmlResource component', () => {
   });
 
   it('renders HTML content from text property using srcDoc', () => {
-    render(<HtmlResource {...defaultProps} />);
+    render(<HTMLResourceRenderer {...defaultProps} />);
     const iframe = screen.getByTitle(
       'MCP HTML Resource (Embedded Content)',
     ) as HTMLIFrameElement;
@@ -28,15 +28,15 @@ describe('HtmlResource component', () => {
   });
 
   it('renders iframe with src for ui:// URI with text ', () => {
-    const props: RenderHtmlResourceProps = {
+    const props: HTMLResourceRendererProps = {
       resource: {
         uri: 'ui://my-app',
         mimeType: 'text/uri-list',
         text: 'https://example.com/app',
       },
-      onUiAction: mockOnUiAction,
+      onUIAction: mockOnUIAction,
     };
-    render(<HtmlResource {...props} />);
+    render(<HTMLResourceRenderer {...props} />);
     const iframe = screen.getByTitle(
       'MCP HTML Resource (URL)',
     ) as HTMLIFrameElement;
@@ -47,17 +47,17 @@ describe('HtmlResource component', () => {
   it('shows loading message initially (concept, actual timing is fast)', () => {
     // This test is more conceptual for async resources not covered by defaultProps
     // For a truly async resource, you'd mock its loading state
-    const loadingProps: RenderHtmlResourceProps = {
+    const loadingProps: HTMLResourceRendererProps = {
       resource: { mimeType: 'text/html', uri: 'ui://loading-resource' }, // No text/blob means it would try to fetch
-      onUiAction: mockOnUiAction,
+      onUIAction: mockOnUIAction,
     };
     // Simulate that it would be loading if content wasn't immediate.
     // Actual component logic might set isLoading=false very quickly if no real async fetch is triggered.
     // To test loading, you would typically mock useMcpResourceFetcher to be in a loading state.
-    render(<HtmlResource {...loadingProps} />);
-    // Since our default HtmlResource resolves synchronously if text/blob is missing for ui://,
+    render(<HTMLResourceRenderer {...loadingProps} />);
+    // Since our default HTMLResource resolves synchronously if text/blob is missing for ui://,
     // it might show an error or "No HTML content" instead of "Loading".
-    // This assertion depends heavily on the refined async logic of HtmlResource.
+    // This assertion depends heavily on the refined async logic of HTMLResource.
     // For now, let's expect the fallback paragraph because no content is provided.
     expect(
       screen.getByText('HTML resource requires text or blob content.'),
@@ -65,11 +65,11 @@ describe('HtmlResource component', () => {
   });
 
   it('displays an error message if resource mimeType is not text/html or text/uri-list', () => {
-    const props: RenderHtmlResourceProps = {
+    const props: HTMLResourceRendererProps = {
       resource: { mimeType: 'application/json', text: '{}' },
-      onUiAction: mockOnUiAction,
+      onUIAction: mockOnUIAction,
     };
-    render(<HtmlResource {...props} />);
+    render(<HTMLResourceRenderer {...props} />);
     expect(
       screen.getByText(
         'Resource must be of type text/html (for HTML content) or text/uri-list (for URL content).',
@@ -80,15 +80,15 @@ describe('HtmlResource component', () => {
   it('decodes HTML from blob for ui:// resource', () => {
     const html = '<p>Blob Content</p>';
     const encodedHtml = Buffer.from(html).toString('base64');
-    const props: RenderHtmlResourceProps = {
+    const props: HTMLResourceRendererProps = {
       resource: {
         uri: 'ui://blob-test',
         mimeType: 'text/html',
         blob: encodedHtml,
       },
-      onUiAction: mockOnUiAction,
+      onUIAction: mockOnUIAction,
     };
-    render(<HtmlResource {...props} />);
+    render(<HTMLResourceRenderer {...props} />);
     const iframe = screen.getByTitle(
       'MCP HTML Resource (Embedded Content)',
     ) as HTMLIFrameElement;
@@ -98,15 +98,15 @@ describe('HtmlResource component', () => {
   it('decodes URL from blob for ui:// resource with text/uri-list mimetype', () => {
     const url = 'https://example.com/blob-app';
     const encodedUrl = Buffer.from(url).toString('base64');
-    const props: RenderHtmlResourceProps = {
+    const props: HTMLResourceRendererProps = {
       resource: {
         uri: 'ui://blob-app-test',
         mimeType: 'text/uri-list',
         blob: encodedUrl,
       },
-      onUiAction: mockOnUiAction,
+      onUIAction: mockOnUIAction,
     };
-    render(<HtmlResource {...props} />);
+    render(<HTMLResourceRenderer {...props} />);
     const iframe = screen.getByTitle(
       'MCP HTML Resource (URL)',
     ) as HTMLIFrameElement;
@@ -119,15 +119,15 @@ describe('HtmlResource component', () => {
       .mockImplementation(() => {});
     const uriList =
       'https://example.com/first\nhttps://example.com/second\nhttps://example.com/third';
-    const props: RenderHtmlResourceProps = {
+    const props: HTMLResourceRendererProps = {
       resource: {
         uri: 'ui://multi-url-test',
         mimeType: 'text/uri-list',
         text: uriList,
       },
-      onUiAction: mockOnUiAction,
+      onUIAction: mockOnUIAction,
     };
-    render(<HtmlResource {...props} />);
+    render(<HTMLResourceRenderer {...props} />);
     const iframe = screen.getByTitle(
       'MCP HTML Resource (URL)',
     ) as HTMLIFrameElement;
@@ -146,15 +146,15 @@ https://example.com/main
 # Another comment
 https://example.com/backup
 `;
-    const props: RenderHtmlResourceProps = {
+    const props: HTMLResourceRendererProps = {
       resource: {
         uri: 'ui://uri-list-with-comments',
         mimeType: 'text/uri-list',
         text: uriList,
       },
-      onUiAction: mockOnUiAction,
+      onUIAction: mockOnUIAction,
     };
-    render(<HtmlResource {...props} />);
+    render(<HTMLResourceRenderer {...props} />);
     const iframe = screen.getByTitle(
       'MCP HTML Resource (URL)',
     ) as HTMLIFrameElement;
@@ -165,48 +165,48 @@ https://example.com/backup
     const uriList = `# Only comments
 # No actual URLs
 `;
-    const props: RenderHtmlResourceProps = {
+    const props: HTMLResourceRendererProps = {
       resource: {
         uri: 'ui://empty-uri-list',
         mimeType: 'text/uri-list',
         text: uriList,
       },
-      onUiAction: mockOnUiAction,
+      onUIAction: mockOnUIAction,
     };
-    render(<HtmlResource {...props} />);
+    render(<HTMLResourceRenderer {...props} />);
     expect(
       screen.getByText('No valid URLs found in uri-list content.'),
     ).toBeInTheDocument();
   });
 });
 
-describe('HtmlResource iframe communication', () => {
+describe('HTMLResource iframe communication', () => {
   beforeEach(() => {
     vi.clearAllMocks();
   });
 
-  const mockResourceBaseForUiActionTests: Partial<Resource> = {
+  const mockResourceBaseForUIActionTests: Partial<Resource> = {
     mimeType: 'text/html',
-    text: '<html><body><h1>Test Content</h1><script>console.log("iframe script loaded for onUiAction tests")</script></body></html>',
+    text: '<html><body><h1>Test Content</h1><script>console.log("iframe script loaded for onUIAction tests")</script></body></html>',
   };
 
-  const mockOnUiAction = vi.fn<[UiActionResult], Promise<unknown>>();
+  const mockOnUIAction = vi.fn<[UIActionResult], Promise<unknown>>();
   const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
 
-  const renderComponentForUiActionTests = (
-    props: Partial<RenderHtmlResourceProps> = {},
+  const renderComponentForUIActionTests = (
+    props: Partial<HTMLResourceRendererProps> = {},
   ) => {
     return render(
-      <HtmlResource
-        resource={props.resource || mockResourceBaseForUiActionTests}
-        onUiAction={'onUiAction' in props ? props.onUiAction : mockOnUiAction}
+      <HTMLResourceRenderer
+        resource={props.resource || mockResourceBaseForUIActionTests}
+        onUIAction={'onUIAction' in props ? props.onUIAction : mockOnUIAction}
         style={props.style}
       />,
     );
   };
 
-  it('should call onUiAction with tool and params when a valid message is received from the iframe', async () => {
-    renderComponentForUiActionTests();
+  it('should call onUIAction with tool and params when a valid message is received from the iframe', async () => {
+    renderComponentForUIActionTests();
     const iframe = (await screen.findByTitle(
       'MCP HTML Resource (Embedded Content)',
     )) as HTMLIFrameElement;
@@ -217,12 +217,12 @@ describe('HtmlResource iframe communication', () => {
     };
     dispatchMessage(iframe.contentWindow, eventData);
 
-    expect(mockOnUiAction).toHaveBeenCalledTimes(1);
-    expect(mockOnUiAction).toHaveBeenCalledWith(eventData);
+    expect(mockOnUIAction).toHaveBeenCalledTimes(1);
+    expect(mockOnUIAction).toHaveBeenCalledWith(eventData);
   });
 
   it('should use empty params if event.data.params is missing', async () => {
-    renderComponentForUiActionTests();
+    renderComponentForUIActionTests();
     const iframe = (await screen.findByTitle(
       'MCP HTML Resource (Embedded Content)',
     )) as HTMLIFrameElement;
@@ -233,12 +233,12 @@ describe('HtmlResource iframe communication', () => {
     }; // No params
     dispatchMessage(iframe.contentWindow, eventData);
 
-    expect(mockOnUiAction).toHaveBeenCalledTimes(1);
-    expect(mockOnUiAction).toHaveBeenCalledWith(eventData);
+    expect(mockOnUIAction).toHaveBeenCalledTimes(1);
+    expect(mockOnUIAction).toHaveBeenCalledWith(eventData);
   });
 
-  it('should not call onUiAction if the message event is not from the iframe', async () => {
-    renderComponentForUiActionTests();
+  it('should not call onUIAction if the message event is not from the iframe', async () => {
+    renderComponentForUIActionTests();
     // Ensure iframe is rendered before dispatching an event from the wrong source
     await screen.findByTitle('MCP HTML Resource (Embedded Content)');
 
@@ -248,25 +248,25 @@ describe('HtmlResource iframe communication', () => {
     };
     dispatchMessage(window, eventData); // Source is the main window
 
-    expect(mockOnUiAction).not.toHaveBeenCalled();
+    expect(mockOnUIAction).not.toHaveBeenCalled();
   });
 
-  it('should not call onUiAction if event.data is null', async () => {
-    renderComponentForUiActionTests();
+  it('should not call onUIAction if event.data is null', async () => {
+    renderComponentForUIActionTests();
     const iframe = (await screen.findByTitle(
       'MCP HTML Resource (Embedded Content)',
     )) as HTMLIFrameElement;
 
     dispatchMessage(iframe.contentWindow, null);
 
-    expect(mockOnUiAction).not.toHaveBeenCalled();
+    expect(mockOnUIAction).not.toHaveBeenCalled();
   });
 
-  it('should work correctly and not throw if onUiAction is undefined', async () => {
-    // Pass undefined directly to onUiAction for this specific test
-    renderComponentForUiActionTests({
-      onUiAction: undefined,
-      resource: mockResourceBaseForUiActionTests,
+  it('should work correctly and not throw if onUIAction is undefined', async () => {
+    // Pass undefined directly to onUIAction for this specific test
+    renderComponentForUIActionTests({
+      onUIAction: undefined,
+      resource: mockResourceBaseForUIActionTests,
     });
     const iframe = (await screen.findByTitle(
       'MCP HTML Resource (Embedded Content)',
@@ -277,19 +277,19 @@ describe('HtmlResource iframe communication', () => {
     expect(() => {
       dispatchMessage(iframe.contentWindow, eventData);
     }).not.toThrow();
-    // mockOnUiAction (the one from the describe block scope) should not be called
+    // mockOnUIAction (the one from the describe block scope) should not be called
     // as it was effectively replaced by 'undefined' for this render.
-    expect(mockOnUiAction).not.toHaveBeenCalled();
+    expect(mockOnUIAction).not.toHaveBeenCalled();
   });
 
-  it('should log an error if onUiAction returns a rejected promise', async () => {
+  it('should log an error if onUIAction returns a rejected promise', async () => {
     const errorMessage = 'Async action failed';
     const specificMockForThisTest = vi
-      .fn<[UiActionResult], Promise<unknown>>()
+      .fn<[UIActionResult], Promise<unknown>>()
       .mockRejectedValue(new Error(errorMessage));
-    renderComponentForUiActionTests({
-      onUiAction: specificMockForThisTest,
-      resource: mockResourceBaseForUiActionTests,
+    renderComponentForUIActionTests({
+      onUIAction: specificMockForThisTest,
+      resource: mockResourceBaseForUIActionTests,
     });
 
     const iframe = (await screen.findByTitle(
@@ -303,19 +303,19 @@ describe('HtmlResource iframe communication', () => {
     });
     await waitFor(() => {
       expect(consoleErrorSpy).toHaveBeenCalledWith(
-        'Error handling UI action result in RenderHtmlResource:',
+        'Error handling UI action result in HTMLResourceRenderer:',
         expect.objectContaining({ message: errorMessage }),
       );
     });
   });
 
-  it('should not attempt to call onUiAction if iframeRef.current is null (e.g. resource error)', async () => {
+  it('should not attempt to call onUIAction if iframeRef.current is null (e.g. resource error)', async () => {
     // Render with a resource that will cause an error and prevent iframe rendering
-    const localMockOnUiAction = vi.fn<[UiActionResult], Promise<unknown>>();
+    const localMockOnUIAction = vi.fn<[UIActionResult], Promise<unknown>>();
     render(
-      <HtmlResource
+      <HTMLResourceRenderer
         resource={{ mimeType: 'text/plain', text: 'not html' }} // Invalid mimeType
-        onUiAction={localMockOnUiAction}
+        onUIAction={localMockOnUIAction}
       />,
     );
 
@@ -333,8 +333,8 @@ describe('HtmlResource iframe communication', () => {
     const eventData = { tool: 'testTool', params: { foo: 'bar' } };
     dispatchMessage(window, eventData);
 
-    expect(localMockOnUiAction).not.toHaveBeenCalled();
-    expect(mockOnUiAction).not.toHaveBeenCalled(); // also check the describe-scoped one
+    expect(localMockOnUIAction).not.toHaveBeenCalled();
+    expect(mockOnUIAction).not.toHaveBeenCalled(); // also check the describe-scoped one
   });
 });
 
diff --git a/packages/client/src/components/__tests__/RemoteDomResource.test.tsx b/packages/client/src/components/__tests__/RemoteDOMResourceRenderer.test.tsx
similarity index 85%
rename from packages/client/src/components/__tests__/RemoteDomResource.test.tsx
rename to packages/client/src/components/__tests__/RemoteDOMResourceRenderer.test.tsx
index 89c157f3..f1c91eba 100644
--- a/packages/client/src/components/__tests__/RemoteDomResource.test.tsx
+++ b/packages/client/src/components/__tests__/RemoteDOMResourceRenderer.test.tsx
@@ -1,6 +1,6 @@
 import { render, screen } from '@testing-library/react';
 import { vi, type Mock } from 'vitest';
-import { RemoteDomResource } from '../RemoteDomResource';
+import { RemoteDOMResourceRenderer } from '../RemoteDOMResourceRenderer';
 import '@testing-library/jest-dom';
 import { basicComponentLibrary } from '../../remote-dom/component-libraries/basic';
 import { RemoteRootRenderer } from '@remote-dom/react/host';
@@ -20,7 +20,7 @@ vi.mock('../iframe-bundle', () => ({
 
 
 
-describe('<RemoteDomResource />', () => {
+describe('<RemoteDOMResourceRenderer />', () => {
   const baseResource = {
     uri: 'ui://test-remote-dom',
     content: 'const a = 1;',
@@ -36,7 +36,7 @@ describe('<RemoteDomResource />', () => {
       mimeType: 'application/vnd.mcp-ui.remote-dom+javascript; flavor=react',
     };
 
-    render(<RemoteDomResource resource={resource} library={basicComponentLibrary} />);
+    render(<RemoteDOMResourceRenderer resource={resource} library={basicComponentLibrary} />);
     
     expect(screen.getByTestId('remote-root-renderer')).toBeInTheDocument();
     expect(screen.queryByTestId('standard-dom-renderer-container')).not.toBeInTheDocument();
@@ -48,7 +48,7 @@ describe('<RemoteDomResource />', () => {
       mimeType: 'application/vnd.mcp-ui.remote-dom+javascript; flavor=webcomponents',
     };
 
-    render(<RemoteDomResource resource={resource} />);
+    render(<RemoteDOMResourceRenderer resource={resource} />);
     
     expect(screen.getByTestId('standard-dom-renderer-container')).toBeInTheDocument();
     expect(screen.queryByTestId('remote-root-renderer')).not.toBeInTheDocument();
@@ -57,7 +57,7 @@ describe('<RemoteDomResource />', () => {
   it('should default to standard DOM renderer when mimeType is not provided', () => {
     const resource = { ...baseResource };
 
-    render(<RemoteDomResource resource={resource} />);
+    render(<RemoteDOMResourceRenderer resource={resource} />);
     
     expect(screen.getByTestId('standard-dom-renderer-container')).toBeInTheDocument();
     expect(screen.queryByTestId('remote-root-renderer')).not.toBeInTheDocument();
@@ -69,7 +69,7 @@ describe('<RemoteDomResource />', () => {
         mimeType: 'application/vnd.mcp-ui.remote-dom+javascript; flavor=unknown',
     };
 
-    render(<RemoteDomResource resource={resource} />);
+    render(<RemoteDOMResourceRenderer resource={resource} />);
     
     expect(screen.getByTestId('standard-dom-renderer-container')).toBeInTheDocument();
     expect(screen.queryByTestId('remote-root-renderer')).not.toBeInTheDocument();
@@ -80,7 +80,7 @@ describe('<RemoteDomResource />', () => {
       ...baseResource,
       mimeType: 'application/vnd.mcp-ui.remote-dom+javascript; flavor=react',
     };
-    render(<RemoteDomResource resource={resource} library={basicComponentLibrary} />);
+    render(<RemoteDOMResourceRenderer resource={resource} library={basicComponentLibrary} />);
 
     const remoteRootRendererMock = RemoteRootRenderer as Mock;
     expect(remoteRootRendererMock).toHaveBeenCalled();
diff --git a/packages/client/src/components/__tests__/ResourceRenderer.test.tsx b/packages/client/src/components/__tests__/UIResourceRenderer.test.tsx
similarity index 50%
rename from packages/client/src/components/__tests__/ResourceRenderer.test.tsx
rename to packages/client/src/components/__tests__/UIResourceRenderer.test.tsx
index 969cd290..6861e04b 100644
--- a/packages/client/src/components/__tests__/ResourceRenderer.test.tsx
+++ b/packages/client/src/components/__tests__/UIResourceRenderer.test.tsx
@@ -1,20 +1,20 @@
 import { render, screen } from '@testing-library/react';
 import { vi } from 'vitest';
-import { ResourceRenderer } from '../ResourceRenderer';
+import { UIResourceRenderer } from '../UIResourceRenderer';
 import '@testing-library/jest-dom';
-import { HtmlResource } from '../HtmlResource';
-import { RemoteDomResource } from '../RemoteDomResource';
+import { HTMLResourceRenderer } from '../HTMLResourceRenderer';
+import { RemoteDOMResourceRenderer } from '../RemoteDOMResourceRenderer';
 import { basicComponentLibrary } from '../../remote-dom/component-libraries/basic';
 
-vi.mock('../HtmlResource', () => ({
-  HtmlResource: vi.fn(() => <div data-testid="html-resource" />),
+vi.mock('../HTMLResourceRenderer', () => ({
+  HTMLResourceRenderer: vi.fn(() => <div data-testid="html-resource" />),
 }));
 
-vi.mock('../RemoteDomResource', () => ({
-  RemoteDomResource: vi.fn(() => <div data-testid="remote-dom-resource" />),
+vi.mock('../RemoteDOMResourceRenderer', () => ({
+  RemoteDOMResourceRenderer: vi.fn(() => <div data-testid="remote-dom-resource" />),
 }));
 
-describe('<ResourceRenderer />', () => {
+describe('<UIResourceRenderer />', () => {
   const baseResource = {
     uri: 'ui://test-resource',
     content: 'test content',
@@ -24,51 +24,51 @@ describe('<ResourceRenderer />', () => {
     vi.clearAllMocks();
   });
 
-  it('should render HtmlResource for "text/html" mimeType', () => {
+  it('should render HTMLResourceRenderer for "text/html" mimeType', () => {
     const resource = { ...baseResource, mimeType: 'text/html' };
-    render(<ResourceRenderer resource={resource} />);
+    render(<UIResourceRenderer resource={resource} />);
     expect(screen.getByTestId('html-resource')).toBeInTheDocument();
-    expect(RemoteDomResource).not.toHaveBeenCalled();
-    expect(HtmlResource).toHaveBeenCalledWith(
+    expect(RemoteDOMResourceRenderer).not.toHaveBeenCalled();
+    expect(HTMLResourceRenderer).toHaveBeenCalledWith(
       { resource },
       {},
     );
   });
 
-  it('should render HtmlResource for "text/uri-list" mimeType', () => {
+  it('should render HTMLResourceRenderer for "text/uri-list" mimeType', () => {
     const resource = { ...baseResource, mimeType: 'text/uri-list' };
-    render(<ResourceRenderer resource={resource} />);
+    render(<UIResourceRenderer resource={resource} />);
     expect(screen.getByTestId('html-resource')).toBeInTheDocument();
-    expect(RemoteDomResource).not.toHaveBeenCalled();
-    expect(HtmlResource).toHaveBeenCalledWith(
+    expect(RemoteDOMResourceRenderer).not.toHaveBeenCalled();
+    expect(HTMLResourceRenderer).toHaveBeenCalledWith(
       { resource },
       {},
     );
   });
 
-  it('should render RemoteDomResource for "remote-dom" mimeType', () => {
+  it('should render RemoteDOMResourceRenderer for "remote-dom" mimeType', () => {
     const resource = {
       ...baseResource,
       mimeType: 'application/vnd.mcp-ui.remote-dom+javascript; flavor=react',
     };
-    render(<ResourceRenderer resource={resource} />);
+    render(<UIResourceRenderer resource={resource} />);
     expect(screen.getByTestId('remote-dom-resource')).toBeInTheDocument();
-    expect(HtmlResource).not.toHaveBeenCalled();
-    expect(RemoteDomResource).toHaveBeenCalledWith({ resource, library: basicComponentLibrary }, {});
+    expect(HTMLResourceRenderer).not.toHaveBeenCalled();
+    expect(RemoteDOMResourceRenderer).toHaveBeenCalledWith({ resource, library: basicComponentLibrary }, {});
   });
 
   it('should render an unsupported message for an unknown mimeType', () => {
     const resource = { ...baseResource, mimeType: 'application/unknown' };
-    render(<ResourceRenderer resource={resource} />);
+    render(<UIResourceRenderer resource={resource} />);
     expect(screen.getByText('Unsupported resource type.')).toBeInTheDocument();
-    expect(HtmlResource).not.toHaveBeenCalled();
-    expect(RemoteDomResource).not.toHaveBeenCalled();
+    expect(HTMLResourceRenderer).not.toHaveBeenCalled();
+    expect(RemoteDOMResourceRenderer).not.toHaveBeenCalled();
   });
 
   it('should render an error if content type is not supported', () => {
     const resource = { ...baseResource, mimeType: 'text/html' };
     render(
-      <ResourceRenderer
+      <UIResourceRenderer
         resource={resource}
         supportedContentTypes={['remoteDom']}
       />,
@@ -76,20 +76,20 @@ describe('<ResourceRenderer />', () => {
     expect(
       screen.getByText('Unsupported content type: rawHtml.'),
     ).toBeInTheDocument();
-    expect(HtmlResource).not.toHaveBeenCalled();
-    expect(RemoteDomResource).not.toHaveBeenCalled();
+    expect(HTMLResourceRenderer).not.toHaveBeenCalled();
+    expect(RemoteDOMResourceRenderer).not.toHaveBeenCalled();
   });
 
   it('should render the resource if content type is supported', () => {
     const resource = { ...baseResource, mimeType: 'text/html' };
     render(
-      <ResourceRenderer
+      <UIResourceRenderer
         resource={resource}
         supportedContentTypes={['rawHtml']}
       />,
     );
     expect(screen.getByTestId('html-resource')).toBeInTheDocument();
-    expect(RemoteDomResource).not.toHaveBeenCalled();
-    expect(HtmlResource).toHaveBeenCalledWith({ resource }, {});
+    expect(RemoteDOMResourceRenderer).not.toHaveBeenCalled();
+    expect(HTMLResourceRenderer).toHaveBeenCalledWith({ resource }, {});
   });
 }); 
\ No newline at end of file
diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
index ed84a93c..47d4efc2 100644
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -1,4 +1,4 @@
-export { ResourceRenderer } from './components/ResourceRenderer';
+export { UIResourceRenderer } from './components/UIResourceRenderer';
 
 // The types needed to create a custom component library
 export type { RemoteElementConfiguration } from './types';
@@ -21,13 +21,13 @@ export {
 } from './remote-dom/remote-elements';
 
 export type {
-  UiActionResult,
-  UiActionType,
+  UIActionResult,
+  UIActionType,
   ResourceContentType,
   ALL_RESOURCE_CONTENT_TYPES,
-  UiActionResultIntent,
-  UiActionResultLink,
-  UiActionResultNotification,
-  UiActionResultPrompt,
-  UiActionResultToolCall,
+  UIActionResultIntent,
+  UIActionResultLink,
+  UIActionResultNotification,
+  UIActionResultPrompt,
+  UIActionResultToolCall,
 } from './types';
diff --git a/packages/client/src/types.ts b/packages/client/src/types.ts
index 307661a0..3f2bfb31 100644
--- a/packages/client/src/types.ts
+++ b/packages/client/src/types.ts
@@ -1,6 +1,6 @@
 import { RemoteReceiver } from '@remote-dom/core/receivers';
 
-export type UiActionType =
+export type UIActionType =
   | 'tool'
   | 'prompt'
   | 'link'
@@ -14,7 +14,7 @@ export const ALL_RESOURCE_CONTENT_TYPES = [
 ] as const;
 export type ResourceContentType = (typeof ALL_RESOURCE_CONTENT_TYPES)[number];
 
-export type UiActionResultToolCall = {
+export type UIActionResultToolCall = {
   type: 'tool';
   payload: {
     toolName: string;
@@ -22,21 +22,21 @@ export type UiActionResultToolCall = {
   };
 };
 
-export type UiActionResultPrompt = {
+export type UIActionResultPrompt = {
   type: 'prompt';
   payload: {
     prompt: string;
   };
 };
 
-export type UiActionResultLink = {
+export type UIActionResultLink = {
   type: 'link';
   payload: {
     url: string;
   };
 };
 
-export type UiActionResultIntent = {
+export type UIActionResultIntent = {
   type: 'intent';
   payload: {
     intent: string;
@@ -44,19 +44,19 @@ export type UiActionResultIntent = {
   };
 };
 
-export type UiActionResultNotification = {
+export type UIActionResultNotification = {
   type: 'notification';
   payload: {
     message: string;
   };
 };
 
-export type UiActionResult =
-  | UiActionResultToolCall
-  | UiActionResultPrompt
-  | UiActionResultLink
-  | UiActionResultIntent
-  | UiActionResultNotification;
+export type UIActionResult =
+  | UIActionResultToolCall
+  | UIActionResultPrompt
+  | UIActionResultLink
+  | UIActionResultIntent
+  | UIActionResultNotification;
 
 /**
  * This is the API that the remote environment (iframe) exports to the host.
diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json
index 3aef79ae..0167ca79 100644
--- a/packages/client/tsconfig.json
+++ b/packages/client/tsconfig.json
@@ -1,7 +1,8 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "jsx": "react-jsx"
+    "jsx": "react-jsx",
+    "forceConsistentCasingInFileNames": true
   },
   "include": ["src"],
   "exclude": ["node_modules", "dist", "src/__tests__"]
diff --git a/packages/server/README.md b/packages/server/README.md
index 6a8fd01f..9f90042b 100644
--- a/packages/server/README.md
+++ b/packages/server/README.md
@@ -35,8 +35,8 @@
 
 `mcp-ui` is a TypeScript SDK comprising two packages:
 
-* **`@mcp-ui/server`**: Utilities to generate UI snippets (`HtmlResourceBlock`) on your MCP server.
-* **`@mcp-ui/client`**: UI components (e.g., `<ResourceRenderer />`) to render those snippets and handle their events.
+* **`@mcp-ui/server`**: Utilities to generate UI resources (`UIResource`) on your MCP server.
+* **`@mcp-ui/client`**: UI components (e.g., `<UIResourceRenderer />`) to render the UI resources and handle their events.
 
 Together, they let you define reusable UI snippets on the server side, seamlessly and securely render them in the client, and react to their actions in the MCP host environment.
 
@@ -44,11 +44,11 @@ Together, they let you define reusable UI snippets on the server side, seamlessl
 
 In essence, by using `mcp-ui` SDKs, servers and hosts can agree on contracts that enable them to create and render interactive UI snippets (as a path to a standardized UI approach in MCP).
 
-### HTML Resource Block
-The primary payload returned from the server to the client is the `HtmlResourceBlock`:
+### UI Resource
+The primary payload returned from the server to the client is the `UIResource`:
 
 ```ts
-interface HtmlResourceBlock {
+interface UIResource {
   type: 'resource';
   resource: {
     uri: string;       // ui://component/id
@@ -67,11 +67,11 @@ interface HtmlResourceBlock {
 
 ### Resource Renderer
 
-The HTML Resource Block is rendered in the `<ResourceRenderer />` component. It automatically detects the resource type and renders the appropriate component.
+The UI Resource is rendered in the `<UIResourceRenderer />` component. It automatically detects the resource type and renders the appropriate component.
 
 It accepts the following props:
 - **`resource`**: The resource object from an MCP response. Should include `uri`, `mimeType`, and content (`text`, `blob`, or `content`)
-- **`onUiAction`**: Optional callback for handling UI actions from the resource:
+- **`onUIAction`**: Optional callback for handling UI actions from the resource:
   ```typescript
   { type: 'tool', payload: { toolName: string, params: Record<string, unknown> } } |
   { type: 'intent', payload: { intent: string, params: Record<string, unknown> } } |
@@ -89,7 +89,7 @@ It accepts the following props:
 
 #### HTML (`text/html` and `text/uri-list`)
 
-Rendered using the `<HtmlResource />` component, which displays content inside an `<iframe>`. This is suitable for self-contained HTML or embedding external apps.
+Rendered using the `<HTMLResourceRenderer />` component, which displays content inside an `<iframe>`. This is suitable for self-contained HTML or embedding external apps.
 
 *   **`mimeType`**:
     *   `text/html`: Renders inline HTML content.
@@ -97,7 +97,7 @@ Rendered using the `<HtmlResource />` component, which displays content inside a
 
 #### Remote DOM (`application/vnd.mcp-ui.remote-dom`)
 
-Rendered using the `<RemoteDomResource />` component, which uses Shopify's [`remote-dom`](https://github.com/Shopify/remote-dom). The server responds with a script that describes the UI and events. On the host, the script is securely rendered in a sandboxed iframe, and the UI changes are communicated to the host in JSON, where they're rendered using the host's component library. This is more flexible than iframes and allows for UIs that match the host's look-and-feel.
+Rendered using the `<RemoteDOMResourceRenderer />` component, which uses Shopify's [`remote-dom`](https://github.com/Shopify/remote-dom). The server responds with a script that describes the UI and events. On the host, the script is securely rendered in a sandboxed iframe, and the UI changes are communicated to the host in JSON, where they're rendered using the host's component library. This is more flexible than iframes and allows for UIs that match the host's look-and-feel.
 
 * **`mimeType`**: `application/vnd.mcp-ui.remote-dom; flavor={react | webcomponents}`
 
@@ -123,7 +123,7 @@ yarn add @mcp-ui/server @mcp-ui/client
 1. **Server-side**: Build your resource blocks
 
    ```ts
-   import { createHtmlResource } from '@mcp-ui/server';
+   import { createUIResource } from '@mcp-ui/server';
    import {
     createRemoteComponent,
     createRemoteDocument,
@@ -131,14 +131,14 @@ yarn add @mcp-ui/server @mcp-ui/client
    } from '@remote-dom/core';
 
    // Inline HTML
-   const htmlResource = createHtmlResource({
+   const htmlResource = createUIResource({
      uri: 'ui://greeting/1',
      content: { type: 'rawHtml', htmlString: '<p>Hello, MCP UI!</p>' },
      delivery: 'text',
    });
 
    // External URL
-   const externalUrlResource = createHtmlResource({
+   const externalUrlResource = createUIResource({
      uri: 'ui://greeting/1',
      content: { type: 'externalUrl', iframeUrl: 'https://example.com' },
      delivery: 'text',
@@ -149,7 +149,7 @@ yarn add @mcp-ui/server @mcp-ui/client
 
    ```tsx
    import React from 'react';
-   import { ResourceRenderer } from '@mcp-ui/client';
+   import { UIResourceRenderer } from '@mcp-ui/client';
 
    function App({ mcpResource }) {
      if (
@@ -157,9 +157,9 @@ yarn add @mcp-ui/server @mcp-ui/client
        mcpResource.resource.uri?.startsWith('ui://')
      ) {
        return (
-         <ResourceRenderer
+         <UIResourceRenderer
            resource={mcpResource.resource}
-           onUiAction={(result) => {
+           onUIAction={(result) => {
              console.log('Action:', result);
              return { status: 'ok' };
            }}
@@ -170,7 +170,7 @@ yarn add @mcp-ui/server @mcp-ui/client
    }
    ```
 
-3. **Enjoy** interactive MCP UI snippets — no extra configuration required.
+3. **Enjoy** interactive MCP UI — no extra configuration required.
 
 ## 🌍 Examples
 
@@ -199,6 +199,7 @@ Host and user security is one of `mcp-ui`'s primary concerns. In all content typ
 - [X] Support Web Components
 - [X] Support Remote-DOM
 - [ ] Add component libraries (in progress)
+- [ ] Support additional frontend frameworks
 - [ ] Add declarative UI content type
 - [ ] Support generative UI?
       
diff --git a/packages/server/src/__tests__/index.test.ts b/packages/server/src/__tests__/index.test.ts
index 8b379716..b5f8beef 100644
--- a/packages/server/src/__tests__/index.test.ts
+++ b/packages/server/src/__tests__/index.test.ts
@@ -1,14 +1,14 @@
-import { createHtmlResource } from '../index';
+import { createUIResource } from '../index';
 
 describe('@mcp-ui/server', () => {
-  describe('createHtmlResource', () => {
+  describe('createUIResource', () => {
     it('should create a text-based direct HTML resource', () => {
       const options = {
         uri: 'ui://test-html' as const,
         content: { type: 'rawHtml' as const, htmlString: '<p>Test</p>' },
         delivery: 'text' as const,
       };
-      const resource = createHtmlResource(options);
+      const resource = createUIResource(options);
       expect(resource.type).toBe('resource');
       expect(resource.resource.uri).toBe('ui://test-html');
       expect(resource.resource.mimeType).toBe('text/html');
@@ -22,7 +22,7 @@ describe('@mcp-ui/server', () => {
         content: { type: 'rawHtml' as const, htmlString: '<h1>Blob</h1>' },
         delivery: 'blob' as const,
       };
-      const resource = createHtmlResource(options);
+      const resource = createUIResource(options);
       expect(resource.resource.blob).toBe(
         Buffer.from('<h1>Blob</h1>').toString('base64'),
       );
@@ -38,7 +38,7 @@ describe('@mcp-ui/server', () => {
         },
         delivery: 'text' as const,
       };
-      const resource = createHtmlResource(options);
+      const resource = createUIResource(options);
       expect(resource.resource.uri).toBe('ui://test-url');
       expect(resource.resource.mimeType).toBe('text/uri-list');
       expect(resource.resource.text).toBe('https://example.com');
@@ -54,7 +54,7 @@ describe('@mcp-ui/server', () => {
         },
         delivery: 'blob' as const,
       };
-      const resource = createHtmlResource(options);
+      const resource = createUIResource(options);
       expect(resource.resource.mimeType).toBe('text/uri-list');
       expect(resource.resource.blob).toBe(
         Buffer.from('https://example.com/blob').toString('base64'),
@@ -68,7 +68,7 @@ describe('@mcp-ui/server', () => {
         content: { type: 'rawHtml' as const, htmlString: '<h1>Blob</h1>' },
         delivery: 'blob' as const,
       };
-      const resource = createHtmlResource(options);
+      const resource = createUIResource(options);
       expect(resource.resource.mimeType).toBe('text/html');
       expect(resource.resource.blob).toBe(
         Buffer.from('<h1>Blob</h1>').toString('base64'),
@@ -83,7 +83,7 @@ describe('@mcp-ui/server', () => {
         delivery: 'text' as const,
       };
       // @ts-expect-error We are intentionally passing an invalid URI to test the error.
-      expect(() => createHtmlResource(options)).toThrow(
+      expect(() => createUIResource(options)).toThrow(
         "MCP SDK: URI must start with 'ui://' when content.type is 'rawHtml'.",
       );
     });
@@ -98,7 +98,7 @@ describe('@mcp-ui/server', () => {
         delivery: 'text' as const,
       };
       // @ts-expect-error We are intentionally passing an invalid URI to test the error.
-      expect(() => createHtmlResource(options)).toThrow(
+      expect(() => createUIResource(options)).toThrow(
         "MCP SDK: URI must start with 'ui://' when content.type is 'externalUrl'.",
       );
     });
@@ -113,7 +113,7 @@ describe('@mcp-ui/server', () => {
         },
         delivery: 'text' as const,
       };
-      const resource = createHtmlResource(options);
+      const resource = createUIResource(options);
       expect(resource.type).toBe('resource');
       expect(resource.resource.uri).toBe('ui://test-remote-dom-react');
       expect(resource.resource.mimeType).toBe(
@@ -133,7 +133,7 @@ describe('@mcp-ui/server', () => {
         },
         delivery: 'blob' as const,
       };
-      const resource = createHtmlResource(options);
+      const resource = createUIResource(options);
       expect(resource.resource.mimeType).toBe(
         'application/vnd.mcp-ui.remote-dom+javascript; flavor=webcomponents',
       );
@@ -154,7 +154,7 @@ describe('@mcp-ui/server', () => {
         delivery: 'text' as const,
       };
       // @ts-expect-error We are intentionally passing an invalid URI to test the error.
-      expect(() => createHtmlResource(options)).toThrow(
+      expect(() => createUIResource(options)).toThrow(
         "MCP SDK: URI must start with 'ui://' when content.type is 'remoteDom'.",
       );
     });
diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts
index 7965a4b7..7ceccc48 100644
--- a/packages/server/src/index.ts
+++ b/packages/server/src/index.ts
@@ -1,25 +1,19 @@
-/**
- * Defines the structure of an interactive HTML resource block
- * that the server will send to the client.
- */
-
-// Import types first
 import {
   Base64BlobContent,
-  CreateHtmlResourceOptions,
-  HtmlTextContent,
+  CreateUIResourceOptions,
+  HTMLTextContent,
   MimeType,
-  UiActionResult,
-  UiActionResultLink,
-  UiActionResultNotification,
-  UiActionResultPrompt,
-  UiActionResultIntent,
-  UiActionResultToolCall,
+  UIActionResult,
+  UIActionResultLink,
+  UIActionResultNotification,
+  UIActionResultPrompt,
+  UIActionResultIntent,
+  UIActionResultToolCall,
 } from './types.js';
 
-export type HtmlResourceBlock = {
+export type UIResource = {
   type: 'resource';
-  resource: HtmlTextContent | Base64BlobContent;
+  resource: HTMLTextContent | Base64BlobContent;
 };
 
 /**
@@ -57,14 +51,14 @@ function robustUtf8ToBase64(str: string): string {
 }
 
 /**
- * Creates an HtmlResourceBlock.
+ * Creates a UIResource.
  * This is the object that should be included in the 'content' array of a toolResult.
  * @param options Configuration for the interactive resource.
- * @returns An HtmlResourceBlock.
+ * @returns a UIResource.
  */
-export function createHtmlResource(
-  options: CreateHtmlResourceOptions,
-): HtmlResourceBlock {
+export function createUIResource(
+  options: CreateUIResourceOptions,
+): UIResource {
   let actualContentString: string;
   let mimeType: MimeType;
 
@@ -116,7 +110,7 @@ export function createHtmlResource(
     );
   }
 
-  let resource: HtmlResourceBlock['resource'];
+  let resource: UIResource['resource'];
 
   switch (options.delivery) {
     case 'text':
@@ -147,12 +141,12 @@ export function createHtmlResource(
 }
 
 export type {
-  CreateHtmlResourceOptions,
+  CreateUIResourceOptions,
   ResourceContentPayload,
-  UiActionResult,
+  UIActionResult,
 } from './types.js';
 
-export function postUiActionResult(result: UiActionResult): void {
+export function postUIActionResult(result: UIActionResult): void {
   if (window.parent) {
     window.parent.postMessage(result, '*');
   }
@@ -161,7 +155,7 @@ export function postUiActionResult(result: UiActionResult): void {
 export function uiActionResultToolCall(
   toolName: string,
   params: Record<string, unknown>,
-): UiActionResultToolCall {
+): UIActionResultToolCall {
   return {
     type: 'tool',
     payload: {
@@ -171,7 +165,7 @@ export function uiActionResultToolCall(
   };
 }
 
-export function uiActionResultPrompt(prompt: string): UiActionResultPrompt {
+export function uiActionResultPrompt(prompt: string): UIActionResultPrompt {
   return {
     type: 'prompt',
     payload: {
@@ -180,7 +174,7 @@ export function uiActionResultPrompt(prompt: string): UiActionResultPrompt {
   };
 }
 
-export function uiActionResultLink(url: string): UiActionResultLink {
+export function uiActionResultLink(url: string): UIActionResultLink {
   return {
     type: 'link',
     payload: {
@@ -192,7 +186,7 @@ export function uiActionResultLink(url: string): UiActionResultLink {
 export function uiActionResultIntent(
   intent: string,
   params: Record<string, unknown>,
-): UiActionResultIntent {
+): UIActionResultIntent {
   return {
     type: 'intent',
     payload: {
@@ -204,7 +198,7 @@ export function uiActionResultIntent(
 
 export function uiActionResultNotification(
   message: string,
-): UiActionResultNotification {
+): UIActionResultNotification {
   return {
     type: 'notification',
     payload: {
diff --git a/packages/server/src/types.ts b/packages/server/src/types.ts
index 966109ee..3d0119c0 100644
--- a/packages/server/src/types.ts
+++ b/packages/server/src/types.ts
@@ -8,7 +8,7 @@ export type MimeType =
   | 'application/vnd.mcp-ui.remote-dom+javascript; flavor=react'
   | 'application/vnd.mcp-ui.remote-dom+javascript; flavor=webcomponents';
 
-export type HtmlTextContent = {
+export type HTMLTextContent = {
   uri: URI;
   mimeType: MimeType;
   text: string; // HTML content (for mimeType `text/html`), or iframe URL (for mimeType `text/uri-list`)
@@ -31,20 +31,20 @@ export type ResourceContentPayload =
       flavor: 'react' | 'webcomponents';
     };
 
-export interface CreateHtmlResourceOptions {
+export interface CreateUIResourceOptions {
   uri: URI;
   content: ResourceContentPayload;
   delivery: 'text' | 'blob';
 }
 
-export type UiActionType =
+export type UIActionType =
   | 'tool'
   | 'prompt'
   | 'link'
   | 'intent'
   | 'notification';
 
-export type UiActionResultToolCall = {
+export type UIActionResultToolCall = {
   type: 'tool';
   payload: {
     toolName: string;
@@ -52,21 +52,21 @@ export type UiActionResultToolCall = {
   };
 };
 
-export type UiActionResultPrompt = {
+export type UIActionResultPrompt = {
   type: 'prompt';
   payload: {
     prompt: string;
   };
 };
 
-export type UiActionResultLink = {
+export type UIActionResultLink = {
   type: 'link';
   payload: {
     url: string;
   };
 };
 
-export type UiActionResultIntent = {
+export type UIActionResultIntent = {
   type: 'intent';
   payload: {
     intent: string;
@@ -74,16 +74,16 @@ export type UiActionResultIntent = {
   };
 };
 
-export type UiActionResultNotification = {
+export type UIActionResultNotification = {
   type: 'notification';
   payload: {
     message: string;
   };
 };
 
-export type UiActionResult =
-  | UiActionResultToolCall
-  | UiActionResultPrompt
-  | UiActionResultLink
-  | UiActionResultIntent
-  | UiActionResultNotification;
+export type UIActionResult =
+  | UIActionResultToolCall
+  | UIActionResultPrompt
+  | UIActionResultLink
+  | UIActionResultIntent
+  | UIActionResultNotification;
diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json
index 7d2acc99..62403114 100644
--- a/packages/server/tsconfig.json
+++ b/packages/server/tsconfig.json
@@ -1,5 +1,8 @@
 {
   "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "forceConsistentCasingInFileNames": true
+  },
   "include": ["src"],
   "exclude": ["node_modules", "dist", "src/__tests__"]
 }