Adding a new, common TermUtils class to replace FieldName enum and utils eventually