diff --git a/ui/src/components/feed/feed-info.tsx b/ui/src/components/feed/feed-info.tsx
index f897da7e..3110c64a 100644
--- a/ui/src/components/feed/feed-info.tsx
+++ b/ui/src/components/feed/feed-info.tsx
@@ -2,7 +2,7 @@ import { createQuery } from '@tanstack/solid-query';
 import { type Component, Match, Switch, createSignal } from 'solid-js';
 import { getFeed } from '~/api/feeds';
 import { QUERY_KEYS } from '~/constants/query';
-import { MenuFeed } from '../menus/menu-feed';
+import { MenuFeed } from '../menus/feed-menu';
 import { FeedHeader } from './feed-header';
 
 type FeedInfoProps = {
diff --git a/ui/src/components/layout/sidebar.tsx b/ui/src/components/layout/sidebar.tsx
index eab2d9ec..f33730c2 100644
--- a/ui/src/components/layout/sidebar.tsx
+++ b/ui/src/components/layout/sidebar.tsx
@@ -1,7 +1,7 @@
 import { cx } from 'class-variance-authority';
 import { type Component, createSignal } from 'solid-js';
 import { FeedList } from '../feed/feed-list';
-import { MenuSettings } from '../menus/menu-settings';
+import { MenuSettings } from '../menus/settings-menu';
 import { LogoSquare } from './logo';
 
 type SidebarProps = {
diff --git a/ui/src/components/menus/menu-feed.tsx b/ui/src/components/menus/feed-menu.tsx
similarity index 100%
rename from ui/src/components/menus/menu-feed.tsx
rename to ui/src/components/menus/feed-menu.tsx
diff --git a/ui/src/components/menus/menu-feeds.tsx b/ui/src/components/menus/feeds-menu.tsx
similarity index 100%
rename from ui/src/components/menus/menu-feeds.tsx
rename to ui/src/components/menus/feeds-menu.tsx
diff --git a/ui/src/components/menus/menu-settings.tsx b/ui/src/components/menus/settings-menu.tsx
similarity index 95%
rename from ui/src/components/menus/menu-settings.tsx
rename to ui/src/components/menus/settings-menu.tsx
index e337dbc9..82f31d9a 100644
--- a/ui/src/components/menus/menu-settings.tsx
+++ b/ui/src/components/menus/settings-menu.tsx
@@ -1,7 +1,7 @@
 import { HiSolidArrowDownTray, HiSolidArrowRightOnRectangle, HiSolidCog6Tooth, HiSolidPlus } from 'solid-icons/hi';
 import { TiCog } from 'solid-icons/ti';
 import { type Component, createSignal, mergeProps } from 'solid-js';
-import { CreateFeedModal } from '../modals/create-feed';
+import { CreateFeedModal } from '../modals/create-feed-modal';
 import { Menu, type MenuProps } from './menu';
 
 export const MenuSettings: Component<MenuProps> = props => {
diff --git a/ui/src/components/modals/create-feed.tsx b/ui/src/components/modals/create-feed-modal.tsx
similarity index 100%
rename from ui/src/components/modals/create-feed.tsx
rename to ui/src/components/modals/create-feed-modal.tsx
diff --git a/ui/src/components/nav/nav-row.tsx b/ui/src/components/nav/nav-row.tsx
index 9a905c8e..ab0861a4 100644
--- a/ui/src/components/nav/nav-row.tsx
+++ b/ui/src/components/nav/nav-row.tsx
@@ -8,7 +8,7 @@ import { Dynamic } from 'solid-js/web';
 import { useQueryState } from '~/hooks/use-query-state';
 import { useViewport } from '~/hooks/use-viewport';
 import { LogoSquare } from '../layout/logo';
-import { MenuSettings } from '../menus/menu-settings';
+import { MenuSettings } from '../menus/settings-menu';
 import { Tooltip } from '../ui/tooltip';
 
 type NavRowProps = {
diff --git a/ui/src/components/panels/list-panel.tsx b/ui/src/components/panels/list-panel.tsx
index 85423d23..5962abf6 100644
--- a/ui/src/components/panels/list-panel.tsx
+++ b/ui/src/components/panels/list-panel.tsx
@@ -9,7 +9,7 @@ import { FeedHeader } from '~/components/feed/feed-header';
 import { FeedInfo } from '~/components/feed/feed-info';
 import { FeedList } from '~/components/feed/feed-list';
 import { Panel } from '~/components/layout/panel';
-import { MenuFeeds } from '~/components/menus/menu-feeds';
+import { MenuFeeds } from '~/components/menus/feeds-menu';
 import { NavRow } from '~/components/nav/nav-row';
 import { NavViewSwitcher } from '~/components/nav/nav-view-switcher';
 import { useQueryState } from '~/hooks/use-query-state';