tut templates
more renames