Fixing naming conflicts in upload modals.