Updates to naming and icon