Support terms with periods in element names