diff --git a/app/soapbox/actions/compose.ts b/app/soapbox/actions/compose.ts
index 57e7909a1..5d8139d71 100644
--- a/app/soapbox/actions/compose.ts
+++ b/app/soapbox/actions/compose.ts
@@ -21,8 +21,8 @@ import { getSettings } from './settings';
 import { createStatus } from './statuses';
 
 import type { History } from 'history';
-import type { Emoji } from 'soapbox/components/autosuggest_emoji';
-import type { AutoSuggestion } from 'soapbox/components/autosuggest_input';
+import type { Emoji } from 'soapbox/components/autosuggest-emoji';
+import type { AutoSuggestion } from 'soapbox/components/autosuggest-input';
 import type { AppDispatch, RootState } from 'soapbox/store';
 import type { Account, APIEntity, Status, Tag } from 'soapbox/types/entities';
 
diff --git a/app/soapbox/actions/emojis.ts b/app/soapbox/actions/emojis.ts
index 04bda6c89..46f591b06 100644
--- a/app/soapbox/actions/emojis.ts
+++ b/app/soapbox/actions/emojis.ts
@@ -1,6 +1,6 @@
 import { saveSettings } from './settings';
 
-import type { Emoji } from 'soapbox/components/autosuggest_emoji';
+import type { Emoji } from 'soapbox/components/autosuggest-emoji';
 import type { AppDispatch } from 'soapbox/store';
 
 const EMOJI_USE = 'EMOJI_USE';
diff --git a/app/soapbox/components/__tests__/autosuggest_emoji.test.tsx b/app/soapbox/components/__tests__/autosuggest-emoji.test.tsx
similarity index 94%
rename from app/soapbox/components/__tests__/autosuggest_emoji.test.tsx
rename to app/soapbox/components/__tests__/autosuggest-emoji.test.tsx
index 8fab0ef8b..e2f059ff7 100644
--- a/app/soapbox/components/__tests__/autosuggest_emoji.test.tsx
+++ b/app/soapbox/components/__tests__/autosuggest-emoji.test.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { render, screen } from '../../jest/test-helpers';
-import AutosuggestEmoji from '../autosuggest_emoji';
+import AutosuggestEmoji from '../autosuggest-emoji';
 
 describe('<AutosuggestEmoji />', () => {
   it('renders native emoji', () => {
diff --git a/app/soapbox/components/__tests__/avatar_overlay.test.tsx b/app/soapbox/components/__tests__/avatar-overlay.test.tsx
similarity index 100%
rename from app/soapbox/components/__tests__/avatar_overlay.test.tsx
rename to app/soapbox/components/__tests__/avatar-overlay.test.tsx
diff --git a/app/soapbox/components/__tests__/display_name.test.tsx b/app/soapbox/components/__tests__/display-name.test.tsx
similarity index 100%
rename from app/soapbox/components/__tests__/display_name.test.tsx
rename to app/soapbox/components/__tests__/display-name.test.tsx
diff --git a/app/soapbox/components/__tests__/emoji_selector.test.tsx b/app/soapbox/components/__tests__/emoji-selector.test.tsx
similarity index 100%
rename from app/soapbox/components/__tests__/emoji_selector.test.tsx
rename to app/soapbox/components/__tests__/emoji-selector.test.tsx
diff --git a/app/soapbox/components/announcements/reactions-bar.tsx b/app/soapbox/components/announcements/reactions-bar.tsx
index 130db2d99..f9569fb90 100644
--- a/app/soapbox/components/announcements/reactions-bar.tsx
+++ b/app/soapbox/components/announcements/reactions-bar.tsx
@@ -9,7 +9,7 @@ import { useSettings } from 'soapbox/hooks';
 import Reaction from './reaction';
 
 import type { List as ImmutableList, Map as ImmutableMap } from 'immutable';
-import type { Emoji } from 'soapbox/components/autosuggest_emoji';
+import type { Emoji } from 'soapbox/components/autosuggest-emoji';
 import type { AnnouncementReaction } from 'soapbox/types/entities';
 
 interface IReactionsBar {
diff --git a/app/soapbox/components/autosuggest-account-input.tsx b/app/soapbox/components/autosuggest-account-input.tsx
index 17c5f41cb..1be14c3ec 100644
--- a/app/soapbox/components/autosuggest-account-input.tsx
+++ b/app/soapbox/components/autosuggest-account-input.tsx
@@ -3,7 +3,7 @@ import throttle from 'lodash/throttle';
 import React, { useState, useRef, useCallback, useEffect } from 'react';
 
 import { accountSearch } from 'soapbox/actions/accounts';
-import AutosuggestInput, { AutoSuggestion } from 'soapbox/components/autosuggest_input';
+import AutosuggestInput, { AutoSuggestion } from 'soapbox/components/autosuggest-input';
 import { useAppDispatch } from 'soapbox/hooks';
 
 import type { Menu } from 'soapbox/components/dropdown-menu';
diff --git a/app/soapbox/components/autosuggest_emoji.tsx b/app/soapbox/components/autosuggest-emoji.tsx
similarity index 100%
rename from app/soapbox/components/autosuggest_emoji.tsx
rename to app/soapbox/components/autosuggest-emoji.tsx
diff --git a/app/soapbox/components/autosuggest_input.tsx b/app/soapbox/components/autosuggest-input.tsx
similarity index 99%
rename from app/soapbox/components/autosuggest_input.tsx
rename to app/soapbox/components/autosuggest-input.tsx
index 9313e092f..cbb79af44 100644
--- a/app/soapbox/components/autosuggest_input.tsx
+++ b/app/soapbox/components/autosuggest-input.tsx
@@ -4,7 +4,7 @@ import { List as ImmutableList } from 'immutable';
 import React from 'react';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import AutosuggestEmoji, { Emoji } from 'soapbox/components/autosuggest_emoji';
+import AutosuggestEmoji, { Emoji } from 'soapbox/components/autosuggest-emoji';
 import Icon from 'soapbox/components/icon';
 import { Input } from 'soapbox/components/ui';
 import AutosuggestAccount from 'soapbox/features/compose/components/autosuggest_account';
diff --git a/app/soapbox/components/autosuggest_textarea.tsx b/app/soapbox/components/autosuggest-textarea.tsx
similarity index 99%
rename from app/soapbox/components/autosuggest_textarea.tsx
rename to app/soapbox/components/autosuggest-textarea.tsx
index 4f80d0b3b..321514cb6 100644
--- a/app/soapbox/components/autosuggest_textarea.tsx
+++ b/app/soapbox/components/autosuggest-textarea.tsx
@@ -7,7 +7,7 @@ import Textarea from 'react-textarea-autosize';
 import AutosuggestAccount from '../features/compose/components/autosuggest_account';
 import { isRtl } from '../rtl';
 
-import AutosuggestEmoji, { Emoji } from './autosuggest_emoji';
+import AutosuggestEmoji, { Emoji } from './autosuggest-emoji';
 
 import type { List as ImmutableList } from 'immutable';
 
diff --git a/app/soapbox/features/compose/components/compose-form.tsx b/app/soapbox/features/compose/components/compose-form.tsx
index e93215aec..df3a7faa4 100644
--- a/app/soapbox/features/compose/components/compose-form.tsx
+++ b/app/soapbox/features/compose/components/compose-form.tsx
@@ -13,8 +13,8 @@ import {
   insertEmojiCompose,
   uploadCompose,
 } from 'soapbox/actions/compose';
-import AutosuggestInput, { AutoSuggestion } from 'soapbox/components/autosuggest_input';
-import AutosuggestTextarea from 'soapbox/components/autosuggest_textarea';
+import AutosuggestInput, { AutoSuggestion } from 'soapbox/components/autosuggest-input';
+import AutosuggestTextarea from 'soapbox/components/autosuggest-textarea';
 import Icon from 'soapbox/components/icon';
 import { Button, Stack } from 'soapbox/components/ui';
 import { useAppDispatch, useAppSelector, useCompose, useFeatures, usePrevious } from 'soapbox/hooks';
@@ -41,7 +41,7 @@ import SpoilerInput from './spoiler-input';
 import TextCharacterCounter from './text_character_counter';
 import VisualCharacterCounter from './visual_character_counter';
 
-import type { Emoji } from 'soapbox/components/autosuggest_emoji';
+import type { Emoji } from 'soapbox/components/autosuggest-emoji';
 
 const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
 
diff --git a/app/soapbox/features/compose/components/emoji-picker/emoji-picker-dropdown.tsx b/app/soapbox/features/compose/components/emoji-picker/emoji-picker-dropdown.tsx
index 697f38c8c..c65f8ecad 100644
--- a/app/soapbox/features/compose/components/emoji-picker/emoji-picker-dropdown.tsx
+++ b/app/soapbox/features/compose/components/emoji-picker/emoji-picker-dropdown.tsx
@@ -14,7 +14,7 @@ import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
 
 import EmojiPickerMenu from './emoji-picker-menu';
 
-import type { Emoji as EmojiType } from 'soapbox/components/autosuggest_emoji';
+import type { Emoji as EmojiType } from 'soapbox/components/autosuggest-emoji';
 import type { RootState } from 'soapbox/store';
 
 let EmojiPicker: any, Emoji: any; // load asynchronously
diff --git a/app/soapbox/features/compose/components/emoji-picker/emoji-picker-menu.tsx b/app/soapbox/features/compose/components/emoji-picker/emoji-picker-menu.tsx
index 7cb12e8f5..a7a4dff28 100644
--- a/app/soapbox/features/compose/components/emoji-picker/emoji-picker-menu.tsx
+++ b/app/soapbox/features/compose/components/emoji-picker/emoji-picker-menu.tsx
@@ -9,7 +9,7 @@ import { buildCustomEmojis } from '../../../emoji/emoji';
 import { EmojiPicker } from './emoji-picker-dropdown';
 import ModifierPicker from './modifier-picker';
 
-import type { Emoji } from 'soapbox/components/autosuggest_emoji';
+import type { Emoji } from 'soapbox/components/autosuggest-emoji';
 
 const backgroundImageFn = () => require('emoji-datasource/img/twitter/sheets/32.png');
 const listenerOptions = supportsPassiveEvents ? { passive: true } : false;
diff --git a/app/soapbox/features/compose/components/polls/poll-form.tsx b/app/soapbox/features/compose/components/polls/poll-form.tsx
index e61f1975f..07a3fb729 100644
--- a/app/soapbox/features/compose/components/polls/poll-form.tsx
+++ b/app/soapbox/features/compose/components/polls/poll-form.tsx
@@ -2,13 +2,13 @@ import React from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import { addPollOption, changePollOption, changePollSettings, clearComposeSuggestions, fetchComposeSuggestions, removePoll, removePollOption, selectComposeSuggestion } from 'soapbox/actions/compose';
-import AutosuggestInput from 'soapbox/components/autosuggest_input';
+import AutosuggestInput from 'soapbox/components/autosuggest-input';
 import { Button, Divider, HStack, Stack, Text, Toggle } from 'soapbox/components/ui';
 import { useAppDispatch, useAppSelector, useCompose } from 'soapbox/hooks';
 
 import DurationSelector from './duration-selector';
 
-import type { AutoSuggestion } from 'soapbox/components/autosuggest_input';
+import type { AutoSuggestion } from 'soapbox/components/autosuggest-input';
 
 const messages = defineMessages({
   option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Answer #{number}' },
diff --git a/app/soapbox/features/compose/components/spoiler-input.tsx b/app/soapbox/features/compose/components/spoiler-input.tsx
index 873450116..139960b68 100644
--- a/app/soapbox/features/compose/components/spoiler-input.tsx
+++ b/app/soapbox/features/compose/components/spoiler-input.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 
 import { changeComposeSpoilerness, changeComposeSpoilerText } from 'soapbox/actions/compose';
-import AutosuggestInput, { IAutosuggestInput } from 'soapbox/components/autosuggest_input';
+import AutosuggestInput, { IAutosuggestInput } from 'soapbox/components/autosuggest-input';
 import { Divider, Stack, Text } from 'soapbox/components/ui';
 import { useAppDispatch, useCompose } from 'soapbox/hooks';
 
diff --git a/app/soapbox/reducers/compose.ts b/app/soapbox/reducers/compose.ts
index 3f02f8cac..8e7fe6b0e 100644
--- a/app/soapbox/reducers/compose.ts
+++ b/app/soapbox/reducers/compose.ts
@@ -56,7 +56,7 @@ import { normalizeAttachment } from '../normalizers/attachment';
 import { unescapeHTML } from '../utils/html';
 
 import type { AnyAction } from 'redux';
-import type { Emoji } from 'soapbox/components/autosuggest_emoji';
+import type { Emoji } from 'soapbox/components/autosuggest-emoji';
 import type {
   Account as AccountEntity,
   APIEntity,
diff --git a/app/soapbox/reducers/settings.ts b/app/soapbox/reducers/settings.ts
index ee8ddc558..70a28a478 100644
--- a/app/soapbox/reducers/settings.ts
+++ b/app/soapbox/reducers/settings.ts
@@ -13,7 +13,7 @@ import {
   FE_NAME,
 } from '../actions/settings';
 
-import type { Emoji } from 'soapbox/components/autosuggest_emoji';
+import type { Emoji } from 'soapbox/components/autosuggest-emoji';
 import type { APIEntity } from 'soapbox/types/entities';
 
 type State = ImmutableMap<string, any>;