rename, tweak template