More renaming, template restructuring