Some templates renames