Fixed attribute naming