Rename icons for consistency