The process needs to be changed. There is no good argument for the behaviour to work as you have it designed.
Using Server File Name is not a workable option because that pre-supposes that I want to update the image name every time I update the record.