- some renamings for templates