More terms titlecased to respect naming convention