Gather images for avatars, few naming changes