Name update and js renaming