We've done this before.
Folk & Country were considered almost interchangeable terms before the fifties. (After all, Uncle Dave Macon is clearly claimed by both sides.)

When the Weavers referred to themselves as "folk", those not wishing to be associated with lefties called their music "country".

But, like many distinctions, there's no clear edge. Bluegrass? Old Timey? Stingbean? Johnny Cash singing with Bob Dylan?