Change to per-image-type getty mangling