The categories come from the federal government data reporting regulations and were definitely intended to be inclusive, rather than to create some artificial distinction between black and african-american (the department of education specifically recognizes that students might use either or both terms).