Cleanup for new names.ActionTag refactor