Modified tpl naming