More words titlecased to respect naming convention