Name template, deprecate safely, fix typo
fix tests