Rename --name to --user.
Fix a watch bug.