A baroque piece is different than a renaissance piece, but both would be considered classical. I think the same categorization applies to modern genres. Classic rock includes subgenres, such as Southern Rock, British invasion, Progressive Rock, and, yes, it now includes Grunge.