Set name more correct