Make some small consistency changes for server and image names