Renaming modals to have a consistent naming scheme