Refactored image names. Added character name fallback.