Fixed attribute names