More TemplateLib -> TemplatePkg