Fix generated attribute names