Converted the rest of term() usage

- Everything is already supported