Follow-up of 3cbf249b. This commit changes event names to be written with underscores everywhere where events are fired (or every place I found in a quick search, anyway).