Rename listen -> watch