Added updating of element name.