more renaming, templates