Regenerate thumbs with sensible names.
Remove some cruft.