Corrected element name and ids