fixed names in template