improve syntax for naming templates with underscore