Updated to new format for non-valid characters in element names