In the context of "things that cause diseases", "pathogen" covers both. But that isn't exactly an answer to your question.