fixing attribute names