At one point '-punk' as in 'steampunk' had come to mean fiddling around with details of something -- neepery? wonkery? So, not necessarily rebellion.

Before that, I'm told a 'punk rock band' meant the players required no credentials, no instruction.