Fixed attribute names conflict