TEIIDDES-1856 added '_' as a valid character for model names