If it makes you feel better, I hold that the proper term is Archosaur, which covers Dinosaurs, Crocodilians, and Birds. And cladistically, in terms of common ancestors, birds are and have always been reptiles.

Also, Re: the Pluto thing: what you should really be angry about is that the only reason the Moon doesn't qualify as a planet is because the IAU specifically excludes it. By all the rules, the moon would at least qualify as a binary planet with Earth, because the moon's orbit around the sun never actually crosses itself. It describes an orbit basically the same shape as the earth's. If Pluto, Ceres, and Eris aren't planets, then Luna definitely is, or their rules are not consistent.

E: removed an innacuracy. See commenter below.