Renaming some include files, and cleaning up the tags to be consistent (there were copy-and-paste errors)