Published phylogenetic reclassifications of Pneumocystis as a fungus resulted in a nomenclatural shift from the Zoological Code to the International Code of Botanical Nomenclature. The same may be true for all microsporidians and sundry other organisms. This resulted in the invalidation of names and subsequently precipitated changes to the botanical code to accommodate Pneumocystis and microsporidian names. The repercussions following application of the 2005 Vienna Code to Pneumocystis nomenclature are detailed. Validity of the name for the human pathogen, Pneumocystis jirovecii, is re-established from its 1976 publication under the Zoological Code, contrary to interpretation of validity under earlier botanical codes. Pneumocystis jirovecii is lectotypified and epitypified. The rat parasite, Pneumocystis carinii, is neotypified, separating it from Pneumocystis wakefieldiae. The original 1909 description of Trypanosoma cruzi, type species for Schizotrypanum, and causal agent of Chagas' disease, included parts of the life cycle of Pneumocystis. Trypanosoma cruzi is neotypified by the true Trypanosoma elements, thereby completing the nomenclatural separation from Pneumocystis and ensuring that Schizotrypanum is not applicable to Pneumocystis as an earlier name. The neotypes for P. carinii and T. cruzi represent the strains currently being investigated by their two respective genome projects. They were selected in light of their medical importance, physiological characterizations, and absence of lectotypifiable materials. The classification and nomenclature of Pneumocystis is reviewed and guidelines given for the publication of new species.