MLDS-24 More consistent naming of modals