Reduce some of the more verbose logging, update internal template name