Terms refactor finished