Fix nightly makefile
Refactor UI event names