fixed attribute names