added token handling for term name