fix event names
simplify build process