Fix attribute rename issue