Go vet and golint the new code once again.

Drop Name from NameTemplate - it's cleaner: nametemplate.Template.