Remove name hardcode