include names for modals and popup changed