Add @property-read annotations to Image model
Rename image files when overwriting them with a file with a different extension