Changed the attribute names