Revert code element_name to element.name