fix names and templates modification