Update image/desc filename management code