adapting to refactoring in term classes