More terms to be titlecased to respect naming convention