Refactor modal naming convention