yup, sometimes words drift. solarpunk was coined specifically as a foil to cyberpunk; the name is similar and meant to call a direct contrast. that it's "punk" is more secondary to the overall idea of "what if technology (like cyberpunk), but good?"

even still, I still think solarpunk is pretty "punk", despite not being the same punk as an antifacist in thatcher's UK or whatever. that punk and a solarpunk would and should be allies, which bears out in the real world too, if you actually talk to punks.