server: try to consistently use (Name.t, string) to represent watches

This applies to both watch events and watch registrations.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>