diff --git a/addons/mail/static/src/components/attachment_delete_confirm_dialog/attachment_delete_confirm_dialog.js b/addons/mail/static/src/components/attachment_delete_confirm/attachment_delete_confirm.js
similarity index 100%
rename from addons/mail/static/src/components/attachment_delete_confirm_dialog/attachment_delete_confirm_dialog.js
rename to addons/mail/static/src/components/attachment_delete_confirm/attachment_delete_confirm.js
diff --git a/addons/mail/static/src/components/attachment_delete_confirm_dialog/attachment_delete_confirm_dialog.xml b/addons/mail/static/src/components/attachment_delete_confirm/attachment_delete_confirm.xml
similarity index 100%
rename from addons/mail/static/src/components/attachment_delete_confirm_dialog/attachment_delete_confirm_dialog.xml
rename to addons/mail/static/src/components/attachment_delete_confirm/attachment_delete_confirm.xml
diff --git a/addons/mail/static/src/components/delete_message_confirm_dialog/delete_message_confirm_dialog.js b/addons/mail/static/src/components/delete_message_confirm/delete_message_confirm.js
similarity index 100%
rename from addons/mail/static/src/components/delete_message_confirm_dialog/delete_message_confirm_dialog.js
rename to addons/mail/static/src/components/delete_message_confirm/delete_message_confirm.js
diff --git a/addons/mail/static/src/components/delete_message_confirm_dialog/delete_message_confirm_dialog.scss b/addons/mail/static/src/components/delete_message_confirm/delete_message_confirm.scss
similarity index 100%
rename from addons/mail/static/src/components/delete_message_confirm_dialog/delete_message_confirm_dialog.scss
rename to addons/mail/static/src/components/delete_message_confirm/delete_message_confirm.scss
diff --git a/addons/mail/static/src/components/delete_message_confirm_dialog/delete_message_confirm_dialog.xml b/addons/mail/static/src/components/delete_message_confirm/delete_message_confirm.xml
similarity index 100%
rename from addons/mail/static/src/components/delete_message_confirm_dialog/delete_message_confirm_dialog.xml
rename to addons/mail/static/src/components/delete_message_confirm/delete_message_confirm.xml
diff --git a/addons/snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.js b/addons/snailmail/static/src/components/snailmail_error/snailmail_error.js
similarity index 100%
rename from addons/snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.js
rename to addons/snailmail/static/src/components/snailmail_error/snailmail_error.js
diff --git a/addons/snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.xml b/addons/snailmail/static/src/components/snailmail_error/snailmail_error.xml
similarity index 100%
rename from addons/snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.xml
rename to addons/snailmail/static/src/components/snailmail_error/snailmail_error.xml