diff --git a/README.md b/README.md
index 92cc13f0..b9d15c4e 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ npm install @tanstack/devtools # no framework, just vanilla js
 ### React
 
 ```tsx
-import { TanstackDevtools } from '@tanstack/react-devtools'
+import { TanStackDevtools } from '@tanstack/react-devtools'
 import { ReactQueryDevtoolsPanel } from '@tanstack/react-query-devtools'
 import { TanStackRouterDevtoolsPanel } from '@tanstack/react-router-devtools'
 
@@ -82,14 +82,14 @@ function App() {
   return (
     <div>
       <h1>My App</h1>
-      <TanstackDevtools
+      <TanStackDevtools
         plugins={[
           {
-            name: 'Tanstack Query',
+            name: 'TanStack Query',
             render: <ReactQueryDevtoolsPanel />,
           },
           {
-            name: 'Tanstack Router',
+            name: 'TanStack Router',
             render: <TanStackRouterDevtoolsPanel router={router} />,
           },
         ]}
diff --git a/docs/configuration.md b/docs/configuration.md
index 36cf37f0..dc3f50eb 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -90,7 +90,7 @@ import { StrictMode } from 'react'
 import { createRoot } from 'react-dom/client'
 import { FormDevtools } from '@tanstack/react-form'
 
-import { TanstackDevtools } from '@tanstack/react-devtools'
+import { TanStackDevtools } from '@tanstack/react-devtools'
 
 import App from './App'
 
@@ -98,12 +98,12 @@ createRoot(document.getElementById('root')!).render(
   <StrictMode>
     <App />
 
-    <TanstackDevtools
+    <TanStackDevtools
       config={{ hideUntilHover: true,  }}
       eventBusConfig={{ debug: true }}
       plugins={[
         {
-          name: 'Tanstack Form',
+          name: 'TanStack Form',
           render: <FormDevtools />,
         },
       ]}
diff --git a/docs/framework/react/basic-setup.md b/docs/framework/react/basic-setup.md
index 3ae0bcae..b831a4d9 100644
--- a/docs/framework/react/basic-setup.md
+++ b/docs/framework/react/basic-setup.md
@@ -13,10 +13,10 @@ Install the [TanStack Devtools](https://www.npmjs.com/package/@tanstack/react-de
 npm i @tanstack/react-devtools
 ```
 
-Next in the root of your application import the `TanstackDevtools` from the required framework adapter (in this case @tanstack/react-devtools).
+Next in the root of your application import the `TanStackDevtools` from the required framework adapter (in this case @tanstack/react-devtools).
 
 ```tsx
-import { TanstackDevtools } from '@tanstack/react-devtools'
+import { TanStackDevtools } from '@tanstack/react-devtools'
 
 import App from './App'
 
@@ -24,12 +24,12 @@ createRoot(document.getElementById('root')!).render(
   <StrictMode>
     <App />
 
-    <TanstackDevtools />
+    <TanStackDevtools />
   </StrictMode>,
 )
 ```
 
-Import the desired devtools and provide it to the `TanstackDevtools` component along with a label for the menu.
+Import the desired devtools and provide it to the `TanStackDevtools` component along with a label for the menu.
 
 Currently TanStack offers:
 
@@ -40,7 +40,7 @@ Currently TanStack offers:
 ```tsx
 import { createRoot } from 'react-dom/client'
 
-import { TanstackDevtools } from '@tanstack/react-devtools'
+import { TanStackDevtools } from '@tanstack/react-devtools'
 
 import { ReactQueryDevtoolsPanel } from '@tanstack/react-query-devtools'
 import { TanStackRouterDevtoolsPanel } from '@tanstack/react-router-devtools'
@@ -53,18 +53,18 @@ createRoot(document.getElementById('root')!).render(
   <StrictMode>
     <App />
 
-    <TanstackDevtools
+    <TanStackDevtools
       plugins={[
         {
-          name: 'Tanstack Query',
+          name: 'TanStack Query',
           render: <ReactQueryDevtoolsPanel />,
         },
         {
-          name: 'Tanstack Router',
+          name: 'TanStack Router',
           render: <TanStackRouterDevtoolsPanel />,
         },
         {
-          name: 'Tanstack Form',
+          name: 'TanStack Form',
           render: <ReactFormDevtoolsPanel />,
         },
       ]}
@@ -73,6 +73,6 @@ createRoot(document.getElementById('root')!).render(
 )
 ```
 
-Finally add any additional configuration you desire to the `TanstackDevtools` component, more information can be found under the [TanStack Devtools Configuration](../../configuration.md) section.
+Finally add any additional configuration you desire to the `TanStackDevtools` component, more information can be found under the [TanStack Devtools Configuration](../../configuration.md) section.
 
 A complete working example can be found in our [basic example](https://tanstack.com/devtools/latest/docs/framework/react/examples/basic).
diff --git a/docs/framework/react/guides/custom-plugins.md b/docs/framework/react/guides/custom-plugins.md
index 1b36cf19..d3ec5e26 100644
--- a/docs/framework/react/guides/custom-plugins.md
+++ b/docs/framework/react/guides/custom-plugins.md
@@ -3,7 +3,7 @@ title: Custom plugins
 id: custom-plugins
 ---
 
-Tanstack devtools allows you to create your own custom plugins by emitting and listening to our event bus.
+TanStack devtools allows you to create your own custom plugins by emitting and listening to our event bus.
 
 ## Prerequisite
 
@@ -144,7 +144,7 @@ createRoot(document.getElementById('root')!).render(
   <StrictMode>
     <App />
 
-    <TanstackDevtools
+    <TanStackDevtools
       plugins={[
         {
           // Name it what you like, this is how it will appear in the Menu
@@ -160,11 +160,11 @@ createRoot(document.getElementById('root')!).render(
 
 ## Debugging
 
-Both the TansTack `TanstackDevtools` component and the TanStack `EventClient` come with built in debug mode which will log to the console the emitted event as well as the EventClient status.
+Both the TansTack `TanStackDevtools` component and the TanStack `EventClient` come with built in debug mode which will log to the console the emitted event as well as the EventClient status.
 
-TanstackDevtool's debugging mode can be activated like so:
+TanStackDevtool's debugging mode can be activated like so:
 ```tsx
-<TanstackDevtools
+<TanStackDevtools
   eventBusConfig={{ debug: true }}
   plugins={[
     {
diff --git a/docs/framework/solid/basic-setup.md b/docs/framework/solid/basic-setup.md
index a8c37dd7..e1e9894f 100644
--- a/docs/framework/solid/basic-setup.md
+++ b/docs/framework/solid/basic-setup.md
@@ -13,10 +13,10 @@ Install the [TanStack Devtools](https://www.npmjs.com/package/@tanstack/solid-de
 npm i @tanstack/solid-devtools
 ```
 
-Next in the root of your application import the `TanstackDevtools` from the required framework adapter (in this case @tanstack/solid-devtools).
+Next in the root of your application import the `TanStackDevtools` from the required framework adapter (in this case @tanstack/solid-devtools).
 
 ```tsx
-import { TanstackDevtools } from '@tanstack/solid-devtools'
+import { TanStackDevtools } from '@tanstack/solid-devtools'
 
 import App from './App'
 
@@ -24,12 +24,12 @@ createRoot(document.getElementById('root')!).render(
   <StrictMode>
     <App />
 
-    <TanstackDevtools />
+    <TanStackDevtools />
   </StrictMode>,
 )
 ```
 
-Import the desired devtools and provide it to the `TanstackDevtools` component along with a label for the menu.
+Import the desired devtools and provide it to the `TanStackDevtools` component along with a label for the menu.
 
 Currently TanStack offers:
 
@@ -40,7 +40,7 @@ Currently TanStack offers:
 ```tsx
 import { render } from 'solid-js/web';
 
-import { TanstackDevtools } from '@tanstack/solid-devtools'
+import { TanStackDevtools } from '@tanstack/solid-devtools'
 
 import { SolidQueryDevtoolsPanel } from '@tanstack/solid-query-devtools'
 import { TanStackRouterDevtoolsPanel } from '@tanstack/solid-router-devtools'
@@ -52,14 +52,14 @@ render(() => (
   <>
     <App />
 
-    <TanstackDevtools
+    <TanStackDevtools
       plugins={[
         {
-          name: 'Tanstack router',
+          name: 'TanStack router',
           render: () => <TanStackRouterDevtoolsPanel />,
         },
         {
-          name: 'Tanstack Form',
+          name: 'TanStack Form',
           render: () => <SolidFormDevtoolsPanel />,
         },
       ]}
@@ -68,6 +68,6 @@ render(() => (
 ), document.getElementById('root')!);
 ```
 
-Finally add any additional configuration you desire to the `TanstackDevtools` component, more information can be found under the [TanStack Devtools Configuration](https://tanstack.com/devtools/) section.
+Finally add any additional configuration you desire to the `TanStackDevtools` component, more information can be found under the [TanStack Devtools Configuration](https://tanstack.com/devtools/) section.
 
 A complete working example can be found in our [examples section](https://tanstack.com/devtools/latest/docs/framework/solid/examples).
diff --git a/docs/framework/solid/reference/functions/tanstackdevtools.md b/docs/framework/solid/reference/functions/tanstackdevtools.md
index 0673c66b..c9dcaca3 100644
--- a/docs/framework/solid/reference/functions/tanstackdevtools.md
+++ b/docs/framework/solid/reference/functions/tanstackdevtools.md
@@ -1,14 +1,14 @@
 ---
-id: TanstackDevtools
-title: TanstackDevtools
+id: TanStackDevtools
+title: TanStackDevtools
 ---
 
 <!-- DO NOT EDIT: this page is autogenerated from the type comments -->
 
-# Function: TanstackDevtools()
+# Function: TanStackDevtools()
 
 ```ts
-function TanstackDevtools(__namedParameters): Element
+function TanStackDevtools(__namedParameters): Element
 ```
 
 Defined in: [devtools.tsx:96](https://github.com/TanStack/devtools/blob/main/packages/solid-devtools/src/devtools.tsx#L96)
@@ -17,7 +17,7 @@ Defined in: [devtools.tsx:96](https://github.com/TanStack/devtools/blob/main/pac
 
 ### \_\_namedParameters
 
-`TanstackDevtoolsInit`
+`TanStackDevtoolsInit`
 
 ## Returns
 
diff --git a/docs/framework/solid/reference/index.md b/docs/framework/solid/reference/index.md
index d4a421cd..ba505f55 100644
--- a/docs/framework/solid/reference/index.md
+++ b/docs/framework/solid/reference/index.md
@@ -13,4 +13,4 @@ title: "@tanstack/solid-devtools"
 
 ## Functions
 
-- [TanstackDevtools](functions/tanstackdevtools.md)
+- [TanStackDevtools](functions/tanstackdevtools.md)
diff --git a/docs/quick-start.md b/docs/quick-start.md
index db704ce2..4fb50176 100644
--- a/docs/quick-start.md
+++ b/docs/quick-start.md
@@ -13,13 +13,13 @@ To get up and running install the correct adapter for your framework:
 Then import the devtools into the root of your application:
 
 ```javascript
-import { TanstackDevtools } from '@tanstack/react-devtools'
+import { TanStackDevtools } from '@tanstack/react-devtools'
 
 function App() {
   return (
     <>
       <YourApp />
-      <TanstackDevtools />
+      <TanStackDevtools />
     </>
   )
 }
@@ -28,13 +28,13 @@ function App() {
 And you're done! If you want to add custom plugins, you can do so by using the `plugins` prop:
 
 ```javascript
-import { TanstackDevtools } from '@tanstack/react-devtools'
+import { TanStackDevtools } from '@tanstack/react-devtools'
 
 function App() {
   return (
     <>
       <YourApp />
-      <TanstackDevtools plugins={[
+      <TanStackDevtools plugins={[
         // Add your custom plugins here
       ]} />
     </>
@@ -44,7 +44,7 @@ function App() {
 
 For example, if you want to add TanStack query & router you could do so in the following way:
 ```javascript
-import { TanstackDevtools } from '@tanstack/react-devtools'
+import { TanStackDevtools } from '@tanstack/react-devtools'
 import { ReactQueryDevtoolsPanel } from '@tanstack/react-query-devtools'
 import { TanStackRouterDevtoolsPanel } from '@tanstack/react-router-devtools'
 
@@ -52,13 +52,13 @@ function App() {
   return (
     <QueryClientProvider client={queryClient}>
       <YourApp />
-      <TanstackDevtools plugins={[
+      <TanStackDevtools plugins={[
         {
-          name: 'Tanstack Query',
+          name: 'TanStack Query',
           render: <ReactQueryDevtoolsPanel />,
         },
         {
-          name: 'Tanstack Router',
+          name: 'TanStack Router',
           render: <TanStackRouterDevtoolsPanel />,
         },
       ]} />
diff --git a/examples/react/basic/src/setup.tsx b/examples/react/basic/src/setup.tsx
index cb6d3c06..91909a22 100644
--- a/examples/react/basic/src/setup.tsx
+++ b/examples/react/basic/src/setup.tsx
@@ -9,7 +9,7 @@ import {
   createRoute,
   createRouter,
 } from '@tanstack/react-router'
-import { TanstackDevtools } from '@tanstack/react-devtools'
+import { TanStackDevtools } from '@tanstack/react-devtools'
 
 const rootRoute = createRootRoute({
   component: () => (
@@ -63,14 +63,14 @@ export default function DevtoolsExample() {
   return (
     <>
       <QueryClientProvider client={queryClient}>
-        <TanstackDevtools
+        <TanStackDevtools
           plugins={[
             {
-              name: 'Tanstack Query',
+              name: 'TanStack Query',
               render: <ReactQueryDevtoolsPanel />,
             },
             {
-              name: 'Tanstack Router',
+              name: 'TanStack Router',
               render: <TanStackRouterDevtoolsPanel router={router} />,
             },
           ]}
diff --git a/examples/react/custom-devtools/src/index.tsx b/examples/react/custom-devtools/src/index.tsx
index 3be7f3c4..e6195a24 100644
--- a/examples/react/custom-devtools/src/index.tsx
+++ b/examples/react/custom-devtools/src/index.tsx
@@ -1,6 +1,6 @@
 import { StrictMode } from 'react'
 import { createRoot } from 'react-dom/client'
-import { TanstackDevtools } from '@tanstack/react-devtools'
+import { TanStackDevtools } from '@tanstack/react-devtools'
 
 import App from './App'
 import CustomDevtoolPanel from './CustomDevtoolsPanel'
@@ -9,7 +9,7 @@ createRoot(document.getElementById('root')!).render(
   <StrictMode>
     <App />
 
-    <TanstackDevtools
+    <TanStackDevtools
       eventBusConfig={{ debug: true }}
       plugins={[
         {
diff --git a/examples/react/start/src/components/devtools.tsx b/examples/react/start/src/components/devtools.tsx
index 0c3e11b3..ede38977 100644
--- a/examples/react/start/src/components/devtools.tsx
+++ b/examples/react/start/src/components/devtools.tsx
@@ -1,7 +1,7 @@
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { ReactQueryDevtoolsPanel } from '@tanstack/react-query-devtools'
 import { TanStackRouterDevtoolsPanel } from '@tanstack/react-router-devtools'
-import { TanstackDevtools } from '@tanstack/react-devtools'
+import { TanStackDevtools } from '@tanstack/react-devtools'
 import { StudioPlugin } from './prisma-plugin'
 import ClientPlugin from './client-plugin'
 
@@ -11,17 +11,17 @@ export default function DevtoolsExample() {
   return (
     <>
       <QueryClientProvider client={queryClient}>
-        <TanstackDevtools
+        <TanStackDevtools
           eventBusConfig={{
             debug: true,
           }}
           plugins={[
             {
-              name: 'Tanstack Query',
+              name: 'TanStack Query',
               render: <ReactQueryDevtoolsPanel />,
             },
             {
-              name: 'Tanstack Router',
+              name: 'TanStack Router',
               render: <TanStackRouterDevtoolsPanel />,
             },
             {
diff --git a/examples/react/start/src/router.tsx b/examples/react/start/src/router.tsx
index 54c35683..1b5fb67c 100644
--- a/examples/react/start/src/router.tsx
+++ b/examples/react/start/src/router.tsx
@@ -1,11 +1,11 @@
-import { createRouter as createTanstackRouter } from '@tanstack/react-router'
+import { createRouter as createTanStackRouter } from '@tanstack/react-router'
 
 // Import the generated route tree
 import { routeTree } from './routeTree.gen'
 
 // Create a new router instance
 export const createRouter = () => {
-  return createTanstackRouter({
+  return createTanStackRouter({
     routeTree,
     scrollRestoration: true,
     defaultPreloadStaleTime: 0,
diff --git a/examples/react/time-travel/src/setup.tsx b/examples/react/time-travel/src/setup.tsx
index bcec391b..90f85933 100644
--- a/examples/react/time-travel/src/setup.tsx
+++ b/examples/react/time-travel/src/setup.tsx
@@ -9,7 +9,7 @@ import {
   createRoute,
   createRouter,
 } from '@tanstack/react-router'
-import { TanstackDevtools } from '@tanstack/react-devtools'
+import { TanStackDevtools } from '@tanstack/react-devtools'
 import { ZustandTimeTravel } from './zustand-time-travel'
 
 const rootRoute = createRootRoute({
@@ -64,14 +64,14 @@ export default function DevtoolsExample() {
   return (
     <>
       <QueryClientProvider client={queryClient}>
-        <TanstackDevtools
+        <TanStackDevtools
           plugins={[
             {
-              name: 'Tanstack Query',
+              name: 'TanStack Query',
               render: <ReactQueryDevtoolsPanel />,
             },
             {
-              name: 'Tanstack Router',
+              name: 'TanStack Router',
               render: <TanStackRouterDevtoolsPanel router={router} />,
             },
             {
diff --git a/examples/solid/basic/src/setup.tsx b/examples/solid/basic/src/setup.tsx
index 3d814a99..3d42407a 100644
--- a/examples/solid/basic/src/setup.tsx
+++ b/examples/solid/basic/src/setup.tsx
@@ -9,7 +9,7 @@ import {
   createRoute,
   createRouter,
 } from '@tanstack/solid-router'
-import { TanstackDevtools } from '@tanstack/solid-devtools'
+import { TanStackDevtools } from '@tanstack/solid-devtools'
 
 const rootRoute = createRootRoute({
   component: () => (
@@ -62,10 +62,10 @@ const queryClient = new QueryClient()
 export default function DevtoolsExample() {
   return (
     <>
-      <TanstackDevtools
+      <TanStackDevtools
         plugins={[
           {
-            name: 'Tanstack Query',
+            name: 'TanStack Query',
             render: (
               <QueryClientProvider client={queryClient}>
                 <SolidQueryDevtools />
@@ -73,7 +73,7 @@ export default function DevtoolsExample() {
             ),
           },
           {
-            name: 'Tanstack Router',
+            name: 'TanStack Router',
             render: <TanStackRouterDevtoolsPanel router={router} />,
           },
         ]}
diff --git a/examples/solid/start/src/app.tsx b/examples/solid/start/src/app.tsx
index e4aff2c3..5d1915ae 100644
--- a/examples/solid/start/src/app.tsx
+++ b/examples/solid/start/src/app.tsx
@@ -1,5 +1,5 @@
 import { createSignal } from 'solid-js'
-import { TanstackDevtools } from '@tanstack/solid-devtools'
+import { TanStackDevtools } from '@tanstack/solid-devtools'
 import './app.css'
 
 export default function App() {
@@ -7,7 +7,7 @@ export default function App() {
 
   return (
     <main>
-      <TanstackDevtools plugins={[]} />
+      <TanStackDevtools plugins={[]} />
 
       <h1>Hello world!</h1>
       <button
diff --git a/packages/event-bus-client/README.md b/packages/event-bus-client/README.md
index 614a17d7..5e1f9b86 100644
--- a/packages/event-bus-client/README.md
+++ b/packages/event-bus-client/README.md
@@ -34,6 +34,6 @@ plugin.on('b', (e) => {
 
 ## Understanding the implementation
 
-The `EventClient` class is a base class for creating plugins that can subscribe to events in the Tanstack Devtools event bus. It allows you to define a set of events and their corresponding data schemas using a standard-schema based schemas.
+The `EventClient` class is a base class for creating plugins that can subscribe to events in the TanStack Devtools event bus. It allows you to define a set of events and their corresponding data schemas using a standard-schema based schemas.
 
 It will work on both the client/server side and all you have to worry about is emitting/listening to events.
diff --git a/packages/event-bus/src/server/index.ts b/packages/event-bus/src/server/index.ts
index 03485a72..fce0ae18 100644
--- a/packages/event-bus/src/server/index.ts
+++ b/packages/event-bus/src/server/index.ts
@@ -1,2 +1,2 @@
 export { ServerEventBus } from './server'
-export type { TanstackDevtoolsEvent } from './server'
+export type { TanStackDevtoolsEvent } from './server'
diff --git a/packages/event-bus/src/server/server.ts b/packages/event-bus/src/server/server.ts
index 719c94f6..93990e13 100644
--- a/packages/event-bus/src/server/server.ts
+++ b/packages/event-bus/src/server/server.ts
@@ -2,7 +2,7 @@ import http from 'node:http'
 import { WebSocket, WebSocketServer } from 'ws'
 
 // Shared types
-export interface TanstackDevtoolsEvent<
+export interface TanStackDevtoolsEvent<
   TEventName extends string,
   TPayload = any,
 > {
@@ -55,7 +55,7 @@ export class ServerEventBus {
     }
   }
 
-  private emitToServer(event: TanstackDevtoolsEvent<string>) {
+  private emitToServer(event: TanStackDevtoolsEvent<string>) {
     this.debugLog('Emitting event to specific server listeners', event)
     this.#eventTarget.dispatchEvent(
       new CustomEvent(event.type, { detail: event }),
@@ -66,7 +66,7 @@ export class ServerEventBus {
     )
   }
 
-  private emitEventToClients(event: TanstackDevtoolsEvent<string>) {
+  private emitEventToClients(event: TanStackDevtoolsEvent<string>) {
     this.debugLog('Emitting event to clients', event)
     const json = JSON.stringify(event)
 
@@ -80,7 +80,7 @@ export class ServerEventBus {
     }
   }
 
-  private emit(event: TanstackDevtoolsEvent<string>) {
+  private emit(event: TanStackDevtoolsEvent<string>) {
     this.emitEventToClients(event)
     this.emitToServer(event)
   }
diff --git a/packages/react-devtools/README.md b/packages/react-devtools/README.md
index 8189f1e5..909aeda7 100644
--- a/packages/react-devtools/README.md
+++ b/packages/react-devtools/README.md
@@ -5,7 +5,7 @@ This package is still under active development and might have breaking changes i
 ## Usage
 
 ```tsx
-import { TanstackDevtools } from '@tanstack/react-devtools'
+import { TanStackDevtools } from '@tanstack/react-devtools'
 import { ReactQueryDevtoolsPanel } from '@tanstack/react-query-devtools'
 import { TanStackRouterDevtoolsPanel } from '@tanstack/react-router-devtools'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
@@ -14,14 +14,14 @@ function App() {
   return (
     <QueryClientProvider client={queryClient}>
       <h1>My App</h1>
-      <TanstackDevtools
+      <TanStackDevtools
         plugins={[
           {
-            name: 'Tanstack Query',
+            name: 'TanStack Query',
             render: <ReactQueryDevtoolsPanel />,
           },
           {
-            name: 'Tanstack Router',
+            name: 'TanStack Router',
             render: <TanStackRouterDevtoolsPanel router={router} />,
           },
         ]}
@@ -33,16 +33,16 @@ function App() {
 
 ## Creating plugins
 
-In order to create a plugin for TanStack Devtools, you can use the `plugins` prop of the `TanstackDevtools` component. Here's an example of how to create a simple plugin:
+In order to create a plugin for TanStack Devtools, you can use the `plugins` prop of the `TanStackDevtools` component. Here's an example of how to create a simple plugin:
 
 ```tsx
-import { TanstackDevtools } from '@tanstack/react-devtools'
+import { TanStackDevtools } from '@tanstack/react-devtools'
 
 function App() {
   return (
     <div>
       <h1>My App</h1>
-      <TanstackDevtools
+      <TanStackDevtools
         plugins={[
           {
             id: 'your-plugin-id',
diff --git a/packages/react-devtools/src/devtools.tsx b/packages/react-devtools/src/devtools.tsx
index 60f4d3d7..8142d4fb 100644
--- a/packages/react-devtools/src/devtools.tsx
+++ b/packages/react-devtools/src/devtools.tsx
@@ -66,7 +66,7 @@ export interface TanStackDevtoolsReactInit {
    *
    * Example:
    * ```jsx
-   * <TanstackDevtools
+   * <TanStackDevtools
    *   plugins={[
    *     {
    *       id: "your-plugin-id",
@@ -97,7 +97,7 @@ const convertRender = (
   setComponent(typeof Component === 'function' ? Component() : Component)
 }
 
-export const TanstackDevtools = ({
+export const TanStackDevtools = ({
   plugins,
   config,
   eventBusConfig,
diff --git a/packages/solid-devtools/README.md b/packages/solid-devtools/README.md
index 6c036f04..6dd1e977 100644
--- a/packages/solid-devtools/README.md
+++ b/packages/solid-devtools/README.md
@@ -5,17 +5,17 @@ This package is still under active development and might have breaking changes i
 ## Usage
 
 ```tsx
-import { TanstackDevtools } from '@tanstack/solid-devtools'
+import { TanStackDevtools } from '@tanstack/solid-devtools'
 import { TanStackRouterDevtoolsPanel } from '@tanstack/solid-router-devtools'
 
 function App() {
   return (
     <div>
       <h1>My App</h1>
-      <TanstackDevtools
+      <TanStackDevtools
         plugins={[
           {
-            name: 'Tanstack Router',
+            name: 'TanStack Router',
             render: <TanStackRouterDevtoolsPanel router={router} />,
           },
         ]}
@@ -27,16 +27,16 @@ function App() {
 
 ## Creating plugins
 
-In order to create a plugin for TanStack Devtools, you can use the `plugins` prop of the `TanstackDevtools` component. Here's an example of how to create a simple plugin:
+In order to create a plugin for TanStack Devtools, you can use the `plugins` prop of the `TanStackDevtools` component. Here's an example of how to create a simple plugin:
 
 ```tsx
-import { TanstackDevtools } from '@tanstack/solid-devtools'
+import { TanStackDevtools } from '@tanstack/solid-devtools'
 
 function App() {
   return (
     <div>
       <h1>My App</h1>
-      <TanstackDevtools
+      <TanStackDevtools
         plugins={[
           {
             id: 'your-plugin-id',
diff --git a/packages/solid-devtools/src/core.tsx b/packages/solid-devtools/src/core.tsx
index 6967e3b3..75064f35 100644
--- a/packages/solid-devtools/src/core.tsx
+++ b/packages/solid-devtools/src/core.tsx
@@ -62,14 +62,14 @@ export type TanStackDevtoolsSolidPlugin = Omit<
    */
   name: string | SolidPluginRender
 }
-export interface TanstackDevtoolsInit {
+export interface TanStackDevtoolsInit {
   /**
    * Array of plugins to be used in the devtools.
    * Each plugin should have a `render` function that returns a React element or a function
    *
    * Example:
    * ```jsx
-   * <TanstackDevtools
+   * <TanStackDevtools
    *   plugins={[
    *     {
    *       id: "your-plugin-id",
@@ -97,7 +97,7 @@ export default function SolidDevtoolsCore({
   config,
   plugins,
   eventBusConfig,
-}: TanstackDevtoolsInit) {
+}: TanStackDevtoolsInit) {
   const [devtools] = createSignal(
     new TanStackDevtoolsCore({
       config,
diff --git a/packages/solid-devtools/src/devtools.tsx b/packages/solid-devtools/src/devtools.tsx
index ac5237fb..fa26e215 100644
--- a/packages/solid-devtools/src/devtools.tsx
+++ b/packages/solid-devtools/src/devtools.tsx
@@ -1,5 +1,5 @@
 import clientOnly from './client-only'
 
-export const TanstackDevtools = clientOnly(() =>
+export const TanStackDevtools = clientOnly(() =>
   import('./core').then((m) => m),
 )
diff --git a/packages/solid-devtools/src/index.ts b/packages/solid-devtools/src/index.ts
index be6adc36..1f595f69 100644
--- a/packages/solid-devtools/src/index.ts
+++ b/packages/solid-devtools/src/index.ts
@@ -4,5 +4,5 @@ export * from '@tanstack/devtools'
  * Export every hook individually - DON'T export from barrel files
  */
 
-export { TanstackDevtools } from './devtools'
+export { TanStackDevtools } from './devtools'
 export type { TanStackDevtoolsSolidPlugin } from './core'