minor refactor from zk_watcher to zkwatcher