Change some of the action and filter names to be more consistent.