Yes, non-profits is a superset of "charitable non-profits". The IRS puts all 501(c)(3) organizations under the same filing framework. Hospitals and universities are in there alongside food banks and shelters. Breaking them out by NTEE code gives a more granular picture is a great idea.