Change naming and icon