Move trigger container name to the add macro level