Fix email triggers and naming.