capitalize; add term role
consistency
Merge pull request #896 from tshepang/consistency

consistency fixes