Big rename/refactoring

Generalizing beyond birds… probably to pigs first