Fixing attribute names