Rename some events, a few fixes.