icons and naming changes