Add element name validator back