Would be especially odd to include the “rock” if you have another modifier before it (ie: folk punk, pop punk, crust).