renaming WatchService to WatchKeyService and simplifying the name of each implementation