Fix: attr names cannot contain punctuation