fixed templates after renaming of grammar rules