Rename image_after, image_before -> png_after, png_before

More specifically than just images, these are special ChunkyPNG objects.
Changing the name may make this more clear, and it results in shorter
lines.

Change-Id: I5ba2f554f3d90ad6f1a56dc5c6c46002d710cc09