a bunch of renaming, and fixing up of templates and rendering