Event names are now correct. Fixes #2530423
Complete build of every module with the new flattened directory structure