Minor change to make things easier in the editor (provide name option for elements)