lots of template renaming and tweaking