Just a few more template renames