simplify image unmarshal
rename types