Thistleknot's nerfed diseases, v6.

From the release note this cleans up various bugs and tidies names.