Apply new icon naming convention