Fixed some attribute names