I suspect you can blur the terms post-punk and new-wave very easily, but the other terms for sub-genres (goth, new-romantic, synth-wave etc) just hadn’t been coined at that point. You’d file say Joy Division, Gang Of Four, OMD (debut), Echo & The Bunnymen, Cure, U2 (Boy only!), Human League (pre-Dare), Throbbing Gristle, Devo, Patti Smith, PIL, Television, B52s, Talking Heads, Young Marble Giants, Durutti Column, ACR etc in the same tubs in any record shop. Maybe in hindsight this wasn’t wise, but as someone who bought this stuff as it came out this is certainly how I remember it.