TX: Add in a few more tweaks for event names.