Don't even bother man. Just do what I did and resign yourself to the knowledge that people love putting punk or goth at the end of words... whether that makes sense or not.
Now I'm just waiting for people to start calling zombie apocalypse settings Zombiepunk, post alien invasion settings Xenopunk and I don't, some ridiculous shit like a post apocalyptic setting where everybody lost their left leg to diabetes Limpypunk