diff --git a/src/components/emoji-input/emoji-input.js b/src/components/emoji_input/emoji_input.js
similarity index 99%
rename from src/components/emoji-input/emoji-input.js
rename to src/components/emoji_input/emoji_input.js
index f751f6a008..5a9d14060a 100644
--- a/src/components/emoji-input/emoji-input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -1,5 +1,5 @@
 import Completion from '../../services/completion/completion.js'
-import EmojiPicker from '../emoji-picker/emoji-picker.vue'
+import EmojiPicker from '../emoji_picker/emoji_picker.vue'
 import { take } from 'lodash'
 
 /**
diff --git a/src/components/emoji-input/emoji-input.vue b/src/components/emoji_input/emoji_input.vue
similarity index 98%
rename from src/components/emoji-input/emoji-input.vue
rename to src/components/emoji_input/emoji_input.vue
index 0541865799..3ca12af1c8 100644
--- a/src/components/emoji-input/emoji-input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -50,7 +50,7 @@
   </div>
 </template>
 
-<script src="./emoji-input.js"></script>
+<script src="./emoji_input.js"></script>
 
 <style lang="scss">
 @import '../../_variables.scss';
diff --git a/src/components/emoji-input/suggestor.js b/src/components/emoji_input/suggestor.js
similarity index 100%
rename from src/components/emoji-input/suggestor.js
rename to src/components/emoji_input/suggestor.js
diff --git a/src/components/emoji-picker/emoji-picker.js b/src/components/emoji_picker/emoji_picker.js
similarity index 100%
rename from src/components/emoji-picker/emoji-picker.js
rename to src/components/emoji_picker/emoji_picker.js
diff --git a/src/components/emoji-picker/emoji-picker.vue b/src/components/emoji_picker/emoji_picker.vue
similarity index 98%
rename from src/components/emoji-picker/emoji-picker.vue
rename to src/components/emoji_picker/emoji_picker.vue
index ec48fc45a5..70d08700f1 100644
--- a/src/components/emoji-picker/emoji-picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -55,7 +55,7 @@
   </div>
 </template>
 
-<script src="./emoji-picker.js"></script>
+<script src="./emoji_picker.js"></script>
 
 <style lang="scss">
 @import '../../_variables.scss';
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 40bbf6d4ed..f646aeb541 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -1,12 +1,12 @@
 import statusPoster from '../../services/status_poster/status_poster.service.js'
 import MediaUpload from '../media_upload/media_upload.vue'
 import ScopeSelector from '../scope_selector/scope_selector.vue'
-import EmojiInput from '../emoji-input/emoji-input.vue'
+import EmojiInput from '../emoji_input/emoji_input.vue'
 import PollForm from '../poll/poll_form.vue'
 import StickerPicker from '../sticker_picker/sticker_picker.vue'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import { reject, map, uniqBy } from 'lodash'
-import suggestor from '../emoji-input/suggestor.js'
+import suggestor from '../emoji_input/suggestor.js'
 
 const buildMentionsString = ({ user, attentions }, currentUser) => {
   let allAttentions = [...attentions]
diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
index b5a7f0dfdd..ae04ce734e 100644
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@@ -11,8 +11,8 @@ import BlockCard from '../block_card/block_card.vue'
 import MuteCard from '../mute_card/mute_card.vue'
 import SelectableList from '../selectable_list/selectable_list.vue'
 import ProgressButton from '../progress_button/progress_button.vue'
-import EmojiInput from '../emoji-input/emoji-input.vue'
-import suggestor from '../emoji-input/suggestor.js'
+import EmojiInput from '../emoji_input/emoji_input.vue'
+import suggestor from '../emoji_input/suggestor.js'
 import Autosuggest from '../autosuggest/autosuggest.vue'
 import Importer from '../importer/importer.vue'
 import Exporter from '../exporter/exporter.vue'