rename
refactored templates with Gepi