Upgrade some templates to be more action specific