refactored watchkeys. Added logic to build event names