Fix names and the pictures.