fixes #8465 - image.name should have distribution and version

* Removes hacks on server.imageName
* properly overrides :name in image model