Fix Image == Name confusion

[Miek Gieben]

Currently it is assume image == pod name, which is generally not true. There is also an Image function that should actually be Name.

Clear up this confusion and use the right terms in the right place.