Removed potentially confusing animals

There are some animals that have colour-like names.  These are
potentially confusing because the name parts are no longer unique to a
position.  For example...

*  red-goldfish
*  gold-redwing

It becomes slightly easier to remember names if each part (or part of
a part) can only exist in one position.

*  "Salmon" is arguably a colour.
*  "Goldfinch" and "Goldfish" both start with colours.