diff --git a/packages/ui-next/api.ts b/packages/ui-next/api.ts
index 6bd00680e..24e6bbb90 100644
--- a/packages/ui-next/api.ts
+++ b/packages/ui-next/api.ts
@@ -1,8 +1,8 @@
 // Context
-export { type PageData, usePageData } from './src/context/pageData';
+export { type PageData, usePageData } from './src/context/page-data';
 
 // Hooks
-export { useUrl } from './src/hooks/useUrl';
+export { useUrl } from './src/hooks/use-url';
 
 // Registry
 export type { ComponentName, RegistryContext } from './src/registry';
diff --git a/packages/ui-next/index.ts b/packages/ui-next/index.ts
index fcacecad3..8e9b34590 100644
--- a/packages/ui-next/index.ts
+++ b/packages/ui-next/index.ts
@@ -6,7 +6,7 @@ import importMetaUrlPlugin from '@chialab/esbuild-plugin-meta-url';
 import react from '@vitejs/plugin-react';
 import c2k from 'koa2-connect/ts';
 import { createServer, type Plugin } from 'vite';
-import type { PageData } from './src/context/pageData';
+import type { PageData } from './src/context/page-data';
 
 const INJECT_MARKER = '<!-- __HYDRO_INJECTION__DO_NOT_REMOVE_THIS__ -->';
 const buildInject = (str: string) => `<script id="__HYDRO_INJECTION__" type="application/json">${str}</script>`;
diff --git a/packages/ui-next/src/App.tsx b/packages/ui-next/src/App.tsx
index 91d87c0a0..365d5a352 100644
--- a/packages/ui-next/src/App.tsx
+++ b/packages/ui-next/src/App.tsx
@@ -1,4 +1,4 @@
-import { usePageData } from './context/pageData';
+import { usePageData } from './context/page-data';
 import { Component } from './registry';
 
 const AppInner = Component('page:app', () => {
diff --git a/packages/ui-next/src/context/pageData.tsx b/packages/ui-next/src/context/page-data.tsx
similarity index 100%
rename from packages/ui-next/src/context/pageData.tsx
rename to packages/ui-next/src/context/page-data.tsx
diff --git a/packages/ui-next/src/hooks/useRouteMap.ts b/packages/ui-next/src/hooks/use-route-map.ts
similarity index 68%
rename from packages/ui-next/src/hooks/useRouteMap.ts
rename to packages/ui-next/src/hooks/use-route-map.ts
index 7e935bc80..f51c0743a 100644
--- a/packages/ui-next/src/hooks/useRouteMap.ts
+++ b/packages/ui-next/src/hooks/use-route-map.ts
@@ -1,4 +1,4 @@
-import { usePageData } from '../context/pageData';
+import { usePageData } from '../context/page-data';
 
 export function useRouteMap(): Record<string, string> {
   const data = usePageData();
diff --git a/packages/ui-next/src/hooks/useUrl.ts b/packages/ui-next/src/hooks/use-url.ts
similarity index 93%
rename from packages/ui-next/src/hooks/useUrl.ts
rename to packages/ui-next/src/hooks/use-url.ts
index e86cd4ff0..a505d6867 100644
--- a/packages/ui-next/src/hooks/useUrl.ts
+++ b/packages/ui-next/src/hooks/use-url.ts
@@ -1,6 +1,6 @@
 import { compile } from 'path-to-regexp';
 import { useCallback } from 'react';
-import { useRouteMap } from './useRouteMap';
+import { useRouteMap } from './use-route-map';
 
 function buildUrl(pattern: string, params: Record<string, string> = {}): string {
   try {
diff --git a/packages/ui-next/src/main.tsx b/packages/ui-next/src/main.tsx
index e5e7298a3..adf7cd2de 100644
--- a/packages/ui-next/src/main.tsx
+++ b/packages/ui-next/src/main.tsx
@@ -1,8 +1,8 @@
 import { StrictMode } from 'react';
 import { createRoot } from 'react-dom/client';
 import plugins from 'virtual:hydro-plugins';
-import App from './App';
-import { type PageData, PageDataProvider } from './context/pageData';
+import App from './app';
+import { type PageData, PageDataProvider } from './context/page-data';
 import { createRegistryContext } from './registry';
 
 const ctx = createRegistryContext();