updated attribute names