Fix origin name and loading modal.