Image reference fixes.
Spades (and a few others) renamed.