changed attribute names