Rename watchpoints to watches.

This is a more appropriate name.