Merge pull request #11806 from jetthoughts/change_model_term_by_simple_word

Remove using of suffix with term. [ci skip]