Elizabeth Hinton (who was on BBC news yesterday) argues for "rebellions" instead of "riots" to describe the events in the inner cities in the mid to late 1960's. Having lived during that period, although I haven't read her book, I think she's wrong.
To me "rebellion" means a degree of central planning and organization, elements which I think were shared through many of the slave "revolts" discussed here. A "riot" usually has an instigating event, a central focus which draws in participants, but there's no central figure like Nat Turner or John Brown.
Hinton has a point that the events from 1964 through 1968 have a continuity and similarity which makes "riots" seem an inadequate terminology.