Refactor academic terms