Making some events more consistently named.